svn merge ^/trunk/blender -r48995:49000
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jul 2012 15:18:02 +0000 (15:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jul 2012 15:18:02 +0000 (15:18 +0000)

Trivial merge