svn merge ^/trunk/blender -r42172:42182
authorCampbell Barton <ideasman42@gmail.com>
Sun, 27 Nov 2011 01:42:56 +0000 (01:42 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 27 Nov 2011 01:42:56 +0000 (01:42 +0000)

Trivial merge