svn merge ^/trunk/blender -r48070:48078
authorCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2012 13:48:19 +0000 (13:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2012 13:48:19 +0000 (13:48 +0000)

Trivial merge