svn merge -r 20822:21041 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Sat, 20 Jun 2009 21:53:57 +0000 (21:53 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Sat, 20 Jun 2009 21:53:57 +0000 (21:53 +0000)

Trivial merge