Comment 16 for bug 275169

Ok, I'm confident enough in the correctness of the incremental changes that I'm going to go ahead with uploading this to jaunty.

Russ, the debdiff against 3.11-3 is attached; let me know if there's a different way you'd like to receive this (such as an explicit Debian bug).