K 10 svn:author V 3 imp K 8 svn:date V 27 1997-01-25T05:28:20.000000Z K 7 svn:log V 120 Apply patch from pr2536, after testing locally. Fixes: PR2446 and PR2536 Submitted by: Flemming Jacobsen END