Ok, this patch is against 2.3.99pre4-1. Other than that no additional
changes have been made versus the take-3 version posted yesterday, because
nobody gave me any feedback.

Please test and/or send feedback.

Thanks again,
Paul Laufer