svn merge -r39830:39831 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 1 Sep 2011 01:28:45 +0000 (01:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 1 Sep 2011 01:28:45 +0000 (01:28 +0000)

Trivial merge