svn merge ^/trunk/blender -r48114:48119
authorCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2012 14:15:01 +0000 (14:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2012 14:15:01 +0000 (14:15 +0000)

Trivial merge