Merge trunk with branch
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Wed, 23 Apr 2008 13:06:53 +0000 (13:06 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Wed, 23 Apr 2008 13:06:53 +0000 (13:06 +0000)
svn merge -r 14521:head https://svn.blender.org/svnroot/bf-blender/trunk/blender


Trivial merge