svn merge ^/trunk/blender -r49063:49067
authorCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jul 2012 13:07:33 +0000 (13:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jul 2012 13:07:33 +0000 (13:07 +0000)

Trivial merge