Merging r49386 through r49389 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Jul 2012 09:47:39 +0000 (09:47 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Jul 2012 09:47:39 +0000 (09:47 +0000)

Trivial merge