svn merge -r 14676:15409 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 2 Jul 2008 21:55:25 +0000 (21:55 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 2 Jul 2008 21:55:25 +0000 (21:55 +0000)

Trivial merge