svn merge ^/trunk/blender -r48158:48160
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 12:38:09 +0000 (12:38 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 12:38:09 +0000 (12:38 +0000)

Trivial merge