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)
commit71c19dadbed638f3a0802e66f69093cf9b1c6303
tree9e44f73c7700ab1a7d61feb6a68fb6dbc2be6407
parent07288789014de44a93392d441198b8d6d029e59a
parent792449f8f0c3fac5ac4cb29db4abaa9c4cf89cd5
Merge from trunk
svn merge -r 19848:20018 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender