Comment 12 for bug 1005155

Here's the patch with my changes since rev 5457. If you need a patch with all changes mentioned in the last comments, pls. let me know (I have to go now, so I won't be able to do this right now).