K 10 svn:author V 5 peter K 8 svn:date V 27 1996-01-07T05:48:49.000000Z K 7 svn:log V 49 Round 1 of the conflict merge. It now compiles.. END