svn merge ^/trunk/blender -r42931:42935
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 14:28:56 +0000 (14:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 14:28:56 +0000 (14:28 +0000)

Trivial merge