svn merge ^/trunk/blender -r42422:42426
authorCampbell Barton <ideasman42@gmail.com>
Sun, 4 Dec 2011 23:39:01 +0000 (23:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 4 Dec 2011 23:39:01 +0000 (23:39 +0000)

Trivial merge