thorpej
Fri Mar 28 16:55:05 PST 1997
Update of /cvsroot/src/sys/netinet
In directory netbsd1:/var/slash-tmp/cvs-serv22440

Modified Files:
	fil.c ip_compat.h ip_fil.c ip_fil.h ip_frag.c ip_frag.h 
	ip_nat.c ip_nat.h ip_state.c ip_state.h 
Log Message:
Resolve conflicts from merge.

XXX !!! XXX !!!
I noticed a few semi-serious bugs while doing this merge, one of which
has existed for a fairly long time.  Some of them are addressed in this
commit (because they caused the kernel to not compile), and are annoted
by "XXX" and "--thorpej".  The other one will be addressed shortly in
a future commit, and, as far as I can tell, affects all operating systems
which IP Filter supports.