svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17335:HEAD
authorCampbell Barton <ideasman42@gmail.com>
Tue, 11 Nov 2008 12:56:57 +0000 (12:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 11 Nov 2008 12:56:57 +0000 (12:56 +0000)

Trivial merge