Merging r43130 through r43500 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 18 Jan 2012 17:25:05 +0000 (17:25 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 18 Jan 2012 17:25:05 +0000 (17:25 +0000)

Trivial merge