Reported by: Ian Jackson <iwj@ncipher.com>; dated Wed, 8 Nov 2000 16:48:02 UTC

This patch is applied upstream (3.3.4) but with some changes so it will not
be a big cludge.
