K 10 svn:author V 6 fenner K 8 svn:date V 27 1999-01-20T07:55:57.000000Z K 7 svn:log V 178 Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's merge algorithm failed on several files, and the translation of the mrouted man page to mdoc didn't help... END