svn merge ^/trunk/blender -r43472:43482
authorCampbell Barton <ideasman42@gmail.com>
Wed, 18 Jan 2012 07:04:17 +0000 (07:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 18 Jan 2012 07:04:17 +0000 (07:04 +0000)

Trivial merge