svn merge ^/trunk/blender -r49707:49710
authorCampbell Barton <ideasman42@gmail.com>
Wed, 8 Aug 2012 17:10:01 +0000 (17:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 8 Aug 2012 17:10:01 +0000 (17:10 +0000)

Trivial merge