Comment 31 for bug 418135

I've put together a proposed update for intrepid as well which has been built and tested locally in an i386 virtualbox instance (issue gone, no immediate regressions).
This also uploaded to my ppa, testing welcome.
Attached debdiff of this proposed update.