Merging r49920 through r49929 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 16 Aug 2012 08:36:26 +0000 (08:36 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 16 Aug 2012 08:36:26 +0000 (08:36 +0000)

Trivial merge