svn merge ^/trunk/blender -r50132:50138
authorCampbell Barton <ideasman42@gmail.com>
Thu, 23 Aug 2012 06:32:51 +0000 (06:32 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 23 Aug 2012 06:32:51 +0000 (06:32 +0000)

Trivial merge