K 10 svn:author V 3 ben K 8 svn:date V 27 2000-11-24T10:22:08.000000Z K 7 svn:log V 46 Mention mergemaster(8). Submitted by: obrien END