K 10 svn:author V 5 markm K 8 svn:date V 27 2000-06-25T20:12:58.000000Z K 7 svn:log V 60 Grr.. Fix FUBARred conflict-merge. This fixes "make world". END