Merging r50245 through r50247 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 27 Aug 2012 12:00:39 +0000 (12:00 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 27 Aug 2012 12:00:39 +0000 (12:00 +0000)

Trivial merge