svn merge ^/trunk/blender -r48411:48415
authorCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jun 2012 20:34:10 +0000 (20:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jun 2012 20:34:10 +0000 (20:34 +0000)
commit244a1c564a16f637d20e0efeeede716b94fd4063
tree7cbd7f79be519f0ee426614819f0cd73db76a6dc
parent5bdf98b399039c11a332cae514af2d7da2fb19c7
parent20d7a380613ca99a141240972a51fcb90d8a3a82
svn merge ^/trunk/blender -r48411:48415