Merging r43501 through r43720 form trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jan 2012 12:12:20 +0000 (12:12 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jan 2012 12:12:20 +0000 (12:12 +0000)

Trivial merge