Merging r43995 through r44002 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 9 Feb 2012 12:35:50 +0000 (12:35 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 9 Feb 2012 12:35:50 +0000 (12:35 +0000)

Trivial merge