Merging r43721 through r43847 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 2 Feb 2012 13:04:52 +0000 (13:04 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 2 Feb 2012 13:04:52 +0000 (13:04 +0000)

Trivial merge