svn merge -r 22111:22138 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Sun, 2 Aug 2009 11:11:15 +0000 (11:11 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Sun, 2 Aug 2009 11:11:15 +0000 (11:11 +0000)

Trivial merge