svn merge -rr40148:40166 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Mon, 12 Sep 2011 14:28:21 +0000 (14:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 12 Sep 2011 14:28:21 +0000 (14:28 +0000)

Trivial merge