svn merge ^/trunk/blender -r49024:49029
authorCampbell Barton <ideasman42@gmail.com>
Wed, 18 Jul 2012 12:56:36 +0000 (12:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 18 Jul 2012 12:56:36 +0000 (12:56 +0000)

Trivial merge