K 10 svn:author V 3 ben K 8 svn:date V 27 2000-08-21T19:10:18.000000Z K 7 svn:log V 139 Mention mergemaster(8) in the "Update /etc" and "Update /dev" sections, plus a couple of other small changes to the "Update /etc" section. END