svn merge ^/trunk/blender -r48305:48307
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2012 10:17:11 +0000 (10:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2012 10:17:11 +0000 (10:17 +0000)
commitc55c194a07ecfd979c303790810903bcb9ec4ba8
treed57ca3d4eec185250da8ce5fe97c088d57c69703
parent58e5ce42db9f1a3c566e3a9deec1e56aaa3f7ae0
parent79ab7f95f90aba459a3b3882c52b31e01250e6b1
svn merge ^/trunk/blender -r48305:48307