svn merge ^/trunk/blender -r47566:47571
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2012 14:22:40 +0000 (14:22 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2012 14:22:40 +0000 (14:22 +0000)

Trivial merge