svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17443:HEAD
authorCampbell Barton <ideasman42@gmail.com>
Sat, 15 Nov 2008 16:55:37 +0000 (16:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 15 Nov 2008 16:55:37 +0000 (16:55 +0000)

Trivial merge