svn merge -r39986:39990 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 8 Sep 2011 04:45:39 +0000 (04:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 8 Sep 2011 04:45:39 +0000 (04:45 +0000)

Trivial merge