svn merge ^/trunk/blender -r48119:48129
authorCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2012 17:12:20 +0000 (17:12 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2012 17:12:20 +0000 (17:12 +0000)

Trivial merge