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

Trivial merge