svn merge -r 40061:40078 https://svn.blender.org/svnroot/bf-blender/trunk/blender soc-2010-nicks
authorBenoit Bolsee <benoit.bolsee@online.be>
Fri, 9 Sep 2011 19:30:33 +0000 (19:30 +0000)
committerBenoit Bolsee <benoit.bolsee@online.be>
Fri, 9 Sep 2011 19:30:33 +0000 (19:30 +0000)

Trivial merge