Comment 41 for bug 1012081

I now also tested this on the current Touch image without any apparent regressions/problems.

Uploaded. I want to run a bunch of our autopkgtests against that version, thus I'll keep this in -proposed for a bit.