Merging r47215 through r47226 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 30 May 2012 14:33:24 +0000 (14:33 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 30 May 2012 14:33:24 +0000 (14:33 +0000)

Trivial merge