Comment 10 for bug 580408

I tested the last little bit of this myself, since it was easier than explaining the horribly convoluted method. :-) In conjunction with your testing, everything looks fine to my eye. Thanks for your work - I'll mark this as verification-done now.