NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

thorpej
Tue May 27 15:51:42 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipftest
In directory netbsd1:/var/slash-tmp/cvs-serv25624

Modified Files:
        Makefile ipt.c 
Log Message:
Resolve conflicts from merge of 3.2a7, take 2.


thorpej
Tue May 27 15:53:50 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipmon
In directory netbsd1:/var/slash-tmp/cvs-serv26671

Modified Files:
        ipmon.c 
Log Message:
Resolve conflicts from merge of 3.2a7, take 2.


thorpej
Tue May 27 15:56:11 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipnat
In directory netbsd1:/var/slash-tmp/cvs-serv27527

Modified Files:
        ipnat.c 
Log Message:
Resolve conflicts from merge of 3.2a7, take 2.