NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

phil
Mon Jul  7 11:33:32 PDT 1997
Update of /cvsroot/src/share/me
In directory netbsd1:/var/slash-tmp/cvs-serv21828

Modified Files:
        Makefile me.7 
Log Message:
Resolve conflicts created by import.