svn merge ^/trunk/blender -r42516:42521
authorCampbell Barton <ideasman42@gmail.com>
Fri, 9 Dec 2011 00:23:57 +0000 (00:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 9 Dec 2011 00:23:57 +0000 (00:23 +0000)

Trivial merge