Hello again,

I fiddled around with some comments and forgot to delete it before diffing.
This is the clean patch...

Rgds,
Stefan