svn merge ^/trunk/blender -r48411:48415
authorCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jun 2012 20:34:10 +0000 (20:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jun 2012 20:34:10 +0000 (20:34 +0000)

Trivial merge