Comment 16 for bug 634554

I appear to have screwed up. The patch isn't even applied, and when I try to apply it it fails hideously due to a conflict with a security patch. I'm not quite sure what I was thinking here.

I'll beat it into a sensible state and try again ...