thorpej
Tue May 27 16:10:53 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipsend
In directory netbsd1:/var/slash-tmp/cvs-serv259

Modified Files:
	44arp.c ip.c ipsend.c sbpf.c 
Log Message:
Resolve conflicts from merge of 3.2a7, take 2.


thorpej
Tue May 27 16:13:22 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/iptest
In directory netbsd1:/var/slash-tmp/cvs-serv1001

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


gwr
Tue May 27 16:14:45 PDT 1997
Update of /cvsroot/src/sys/netinet
In directory netbsd1:/var/slash-tmp/cvs-serv965

Modified Files:
	if_arp.c 
Log Message:
Allow revarpwhoami() to be called multiple times.
(Just return the answer if we already have it.)
Without this, the RB_ASKNAME loop fails on every
call to nfs_mountroot after the first call.