svn merge ^/trunk/blender -r49250:49252
authorCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2012 13:42:33 +0000 (13:42 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2012 13:42:33 +0000 (13:42 +0000)

Trivial merge