Merging r43848 through r43870 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Feb 2012 18:47:15 +0000 (18:47 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Feb 2012 18:47:15 +0000 (18:47 +0000)

Trivial merge