svn merge -r 14505:14561 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Sun, 27 Apr 2008 17:22:57 +0000 (17:22 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Sun, 27 Apr 2008 17:22:57 +0000 (17:22 +0000)

Trivial merge