svn merge ^/trunk/blender -r46963:46966
authorCampbell Barton <ideasman42@gmail.com>
Thu, 24 May 2012 10:18:54 +0000 (10:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 24 May 2012 10:18:54 +0000 (10:18 +0000)

Trivial merge