svn merge ^/trunk/blender -r48313:48321
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2012 20:36:19 +0000 (20:36 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2012 20:36:19 +0000 (20:36 +0000)

Trivial merge