svn merge ^/trunk/blender -r48105:48109
authorCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2012 10:03:02 +0000 (10:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2012 10:03:02 +0000 (10:03 +0000)

Trivial merge