Module Name:	src
Committed By:	skrll
Date:		Thu Aug  5 21:01:25 UTC 2004

Modified Files:
	src/sys/netinet [ktrace-lwp]: in.c ip_fil_netbsd.c ip_ftp_pxy.c
	    ip_ipsec_pxy.c ip_irc_pxy.c ip_lookup.c ip_pool.c ip_pptp_pxy.c
	    ip_rpcb_pxy.c

Log Message:
Fix merge mistakes.


To generate a diff of this commit:
cvs rdiff -r1.89.2.1 -r1.89.2.2 src/sys/netinet/in.c
cvs rdiff -r1.12.2.1 -r1.12.2.2 src/sys/netinet/ip_fil_netbsd.c
cvs rdiff -r1.26.6.1 -r1.26.6.2 src/sys/netinet/ip_ftp_pxy.c
cvs rdiff -r1.2.10.1 -r1.2.10.2 src/sys/netinet/ip_ipsec_pxy.c
cvs rdiff -r1.1.1.2.2.1 -r1.1.1.2.2.2 src/sys/netinet/ip_irc_pxy.c \
    src/sys/netinet/ip_pptp_pxy.c src/sys/netinet/ip_rpcb_pxy.c
cvs rdiff -r1.3.2.1 -r1.3.2.2 src/sys/netinet/ip_lookup.c
cvs rdiff -r1.4.2.1 -r1.4.2.2 src/sys/netinet/ip_pool.c

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