svn merge ^/trunk/blender -r48321:48333
authorCampbell Barton <ideasman42@gmail.com>
Wed, 27 Jun 2012 14:36:06 +0000 (14:36 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 27 Jun 2012 14:36:06 +0000 (14:36 +0000)

Trivial merge