svn merge ^/trunk/blender -r48305:48307
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2012 10:17:11 +0000 (10:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2012 10:17:11 +0000 (10:17 +0000)

Trivial merge