I've always assumed it was defuse, but I've seen two people on a thread use 'diffuse' (I don't want to ask them as I think that particular thread needs to sink into oblivion...)