svn merge ^/trunk/blender -r48133:48140
authorCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2012 21:11:57 +0000 (21:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2012 21:11:57 +0000 (21:11 +0000)

Trivial merge