Merging r49667 through r49680 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 8 Aug 2012 08:21:58 +0000 (08:21 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 8 Aug 2012 08:21:58 +0000 (08:21 +0000)

Trivial merge