Merging r44109 through r44128 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 15 Feb 2012 16:04:57 +0000 (16:04 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 15 Feb 2012 16:04:57 +0000 (16:04 +0000)

Trivial merge