svn merge ^/trunk/blender -r49531:49533
authorCampbell Barton <ideasman42@gmail.com>
Fri, 3 Aug 2012 15:05:20 +0000 (15:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 3 Aug 2012 15:05:20 +0000 (15:05 +0000)
commit82158b7c34584fb3d096b36a3a8258db7dc0f852
tree79d57f4b3c06ff16d7298ee4d2bf0b85d25ae6ee
parent19740e92332bac5ee5af115285e846a4e1ca3969
parent173b998735ee30bdb4335ae2c65cf656d9249504
svn merge ^/trunk/blender -r49531:49533