Merging r43025 through r43129 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 4 Jan 2012 15:42:07 +0000 (15:42 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 4 Jan 2012 15:42:07 +0000 (15:42 +0000)

Trivial merge