Merging r42193 through r42349 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 2 Dec 2011 19:40:20 +0000 (19:40 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 2 Dec 2011 19:40:20 +0000 (19:40 +0000)

Trivial merge