svn merge -r41420:41422 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 1 Nov 2011 02:59:55 +0000 (02:59 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 1 Nov 2011 02:59:55 +0000 (02:59 +0000)

Trivial merge