svn merge -r 16453:16485 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Fri, 12 Sep 2008 12:58:08 +0000 (12:58 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Fri, 12 Sep 2008 12:58:08 +0000 (12:58 +0000)

Trivial merge