svn merge ^/trunk/blender -r50089:50091
authorCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2012 15:45:58 +0000 (15:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2012 15:45:58 +0000 (15:45 +0000)

Trivial merge