Module Name:	syssrc
Committed By:	veego
Date:		Sun May 21 18:45:56 UTC 2000

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

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.33 -r1.34 syssrc/sys/netinet/fil.c
cvs rdiff -r1.50 -r1.51 syssrc/sys/netinet/ip_fil.c
cvs rdiff -r1.15 -r1.16 syssrc/sys/netinet/ip_ftp_pxy.c
cvs rdiff -r1.32 -r1.33 syssrc/sys/netinet/ip_nat.c
cvs rdiff -r1.18 -r1.19 syssrc/sys/netinet/ip_nat.h
cvs rdiff -r1.24 -r1.25 syssrc/sys/netinet/ip_state.c
cvs rdiff -r1.5 -r1.6 syssrc/sys/netinet/ipl.h

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