svn merge ^/trunk/blender -r49410:49412
authorCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2012 13:44:51 +0000 (13:44 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2012 13:44:51 +0000 (13:44 +0000)

Trivial merge