svn merge ^/trunk/blender -r40379:40381
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 06:31:36 +0000 (06:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 06:31:36 +0000 (06:31 +0000)

Trivial merge