Merging r36831 through r37009 from trunk into tomato branch.
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 May 2011 04:10:25 +0000 (04:10 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 May 2011 04:10:25 +0000 (04:10 +0000)

Trivial merge