svn merge ^/trunk/blender -r49628:49634
authorCampbell Barton <ideasman42@gmail.com>
Mon, 6 Aug 2012 19:37:35 +0000 (19:37 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 6 Aug 2012 19:37:35 +0000 (19:37 +0000)

Trivial merge