svn merge ^/trunk/blender -r49929:49933
authorCampbell Barton <ideasman42@gmail.com>
Thu, 16 Aug 2012 10:15:05 +0000 (10:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 16 Aug 2012 10:15:05 +0000 (10:15 +0000)

Trivial merge