Merging r41937 through r42061 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 22 Nov 2011 14:04:34 +0000 (14:04 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 22 Nov 2011 14:04:34 +0000 (14:04 +0000)

Trivial merge