Merging r47691 through r47698 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 10 Jun 2012 18:47:36 +0000 (18:47 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 10 Jun 2012 18:47:36 +0000 (18:47 +0000)

Trivial merge