Joachim Wieland attempted to post this patch, but it appears to be gone.
I tried a repost, and notivced it got rejected because it was >100kb.
Let me repeat previous objections that it really should be possible to
post a patch >100kb.
That said, here's a gzipped version.
Joachim, once it comes through, feel free to post whatever comments you
had in your original mail.
//Magnus
