Re-copied trunk over tomato and merging r41929 through r41936 into tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 16 Nov 2011 20:53:00 +0000 (20:53 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 16 Nov 2011 20:53:00 +0000 (20:53 +0000)

Trivial merge