svn merge ^/trunk/blender -r49917:49919
authorCampbell Barton <ideasman42@gmail.com>
Wed, 15 Aug 2012 11:32:56 +0000 (11:32 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 15 Aug 2012 11:32:56 +0000 (11:32 +0000)

Trivial merge