svn merge ^/trunk/blender -r48681:48691
authorCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2012 20:28:35 +0000 (20:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2012 20:28:35 +0000 (20:28 +0000)

Trivial merge