svn merge ^/trunk/blender -r50107:50112
authorCampbell Barton <ideasman42@gmail.com>
Wed, 22 Aug 2012 12:04:27 +0000 (12:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 22 Aug 2012 12:04:27 +0000 (12:04 +0000)

Trivial merge