svn merge ^/trunk/blender -r48129:48133
authorCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2012 17:37:37 +0000 (17:37 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2012 17:37:37 +0000 (17:37 +0000)
commit3966f7451d251c8ab612ec17fd76ab7fbdbd7397
tree6f1b8c97f6f09c2e9ca9bee3f3db23b343eb2091
parente631cf706285cee6d563b138c73f05b28ea6992f
parentdc7770d1a13af0946b8904bf5dd3a1a03604c8d5
svn merge ^/trunk/blender -r48129:48133