svn merge ^/trunk/blender -r49518:49520
authorCampbell Barton <ideasman42@gmail.com>
Fri, 3 Aug 2012 09:53:24 +0000 (09:53 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 3 Aug 2012 09:53:24 +0000 (09:53 +0000)

Trivial merge