Ubuntu

Comment 11 for bug 60448

This is the debdiff applied to edgy, should also be suitable for Dapper.