svn merge ^/trunk/blender -r48140:48147
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 06:10:51 +0000 (06:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 06:10:51 +0000 (06:10 +0000)

Trivial merge