svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17471:HEAD
authorCampbell Barton <ideasman42@gmail.com>
Wed, 19 Nov 2008 03:43:03 +0000 (03:43 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 19 Nov 2008 03:43:03 +0000 (03:43 +0000)

Trivial merge