Ubuntu

Comment 40 for bug 450684

Created an attachment (id=424936)
short term fix v0

This needs more testing before I request review. I've pushed the patch to the try servers, and I'll post a link so that people can test the patch once the builds complete.