svn merge ^/trunk/blender -r42329:42333
authorCampbell Barton <ideasman42@gmail.com>
Fri, 2 Dec 2011 03:32:59 +0000 (03:32 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 2 Dec 2011 03:32:59 +0000 (03:32 +0000)

Trivial merge