svn merge ^/trunk/blender -r49000:49002
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jul 2012 15:45:27 +0000 (15:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jul 2012 15:45:27 +0000 (15:45 +0000)

Trivial merge