Module Name:	syssrc
Committed By:	veego
Date:		Mon Jun 12 10:28:23 UTC 2000

Modified Files:
	syssrc/sys/netinet: fil.c ip_fil.c ip_fil.h ip_frag.c ip_nat.c ip_nat.h
	    ipl.h

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.35 -r1.36 syssrc/sys/netinet/fil.c
cvs rdiff -r1.53 -r1.54 syssrc/sys/netinet/ip_fil.c
cvs rdiff -r1.36 -r1.37 syssrc/sys/netinet/ip_fil.h
cvs rdiff -r1.19 -r1.20 syssrc/sys/netinet/ip_frag.c \
    syssrc/sys/netinet/ip_nat.h
cvs rdiff -r1.33 -r1.34 syssrc/sys/netinet/ip_nat.c
cvs rdiff -r1.7 -r1.8 syssrc/sys/netinet/ipl.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.