Merging r49624 through r49628 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 6 Aug 2012 17:07:20 +0000 (17:07 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 6 Aug 2012 17:07:20 +0000 (17:07 +0000)

Trivial merge