svn merge -r 20486:20651 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 5 Jun 2009 15:19:13 +0000 (15:19 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 5 Jun 2009 15:19:13 +0000 (15:19 +0000)

Trivial merge