Merging r46456 through r46468 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 9 May 2012 15:37:56 +0000 (15:37 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 9 May 2012 15:37:56 +0000 (15:37 +0000)

Trivial merge