The patch looks good, and I will apply it (once I have read through it fully), but could you please re-mail it as an attachment instead? (Or put it up as a file on the web somewhere and mail a link.) In the body of your mail it gets mangled at some stage with random line breaks inserted. --tml