Merge from trunk
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 1 May 2009 16:59:27 +0000 (16:59 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 1 May 2009 16:59:27 +0000 (16:59 +0000)
svn merge -r 19848:20018 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender


Trivial merge