svn merge ^/trunk/blender -r48188:48195
authorCampbell Barton <ideasman42@gmail.com>
Fri, 22 Jun 2012 15:08:33 +0000 (15:08 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 22 Jun 2012 15:08:33 +0000 (15:08 +0000)

Trivial merge