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

Trivial merge