Merging r50190 through r50191 from into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 24 Aug 2012 16:11:12 +0000 (16:11 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 24 Aug 2012 16:11:12 +0000 (16:11 +0000)

Trivial merge