svn merge ^/trunk/blender -r49939:49945
authorCampbell Barton <ideasman42@gmail.com>
Fri, 17 Aug 2012 08:25:23 +0000 (08:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 17 Aug 2012 08:25:23 +0000 (08:25 +0000)

Trivial merge