Merging r42178 through r42192 form trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 27 Nov 2011 19:35:46 +0000 (19:35 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 27 Nov 2011 19:35:46 +0000 (19:35 +0000)

Trivial merge