Merging r49362 through r49385 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Jul 2012 07:53:05 +0000 (07:53 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Jul 2012 07:53:05 +0000 (07:53 +0000)

Trivial merge