svn merge ^/trunk/blender -r49531:49533
authorCampbell Barton <ideasman42@gmail.com>
Fri, 3 Aug 2012 15:05:20 +0000 (15:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 3 Aug 2012 15:05:20 +0000 (15:05 +0000)

Trivial merge