svn merge ^/trunk/blender -r50039:50044
authorCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2012 14:01:16 +0000 (14:01 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2012 14:01:16 +0000 (14:01 +0000)

Trivial merge