K 10 svn:author V 3 pst K 8 svn:date V 27 1997-05-01T16:24:37.000000Z K 7 svn:log V 59 Clean up merge from 2.2 (without spamming peter's changes) END