svn merge ^/trunk/blender -r49886:49890
authorCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2012 12:18:58 +0000 (12:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2012 12:18:58 +0000 (12:18 +0000)

Trivial merge