svn merge ^/trunk/blender -r42902:42911
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 08:36:25 +0000 (08:36 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 08:36:25 +0000 (08:36 +0000)

Trivial merge