Merging r49223 through r49225 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 25 Jul 2012 20:28:06 +0000 (20:28 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 25 Jul 2012 20:28:06 +0000 (20:28 +0000)

Trivial merge