Module Name:	src
Committed By:	itojun
Date:		Fri Sep 12 11:21:00 UTC 2003

Modified Files:
	src/sys/conf: files
	src/sys/netipsec: ipsec.c ipsec_input.c ipsec_netbsd.c ipsec_output.c
	    xform_ah.c xform_esp.c xform_ipcomp.c xform_ipip.c
Added Files:
	src/sys/netipsec: files.netipsec
Removed Files:
	src/sys/netipsec: files.ipsec key.c key.h key_debug.c key_debug.h
	    key_var.h

Log Message:
merge netipsec/key* into netkey/key*.  no need for both.
change confusing filename


To generate a diff of this commit:
cvs rdiff -r1.631 -r1.632 src/sys/conf/files
cvs rdiff -r1.3 -r0 src/sys/netipsec/files.ipsec
cvs rdiff -r0 -r1.1 src/sys/netipsec/files.netipsec
cvs rdiff -r1.2 -r1.3 src/sys/netipsec/ipsec.c src/sys/netipsec/xform_ah.c \
    src/sys/netipsec/xform_esp.c src/sys/netipsec/xform_ipcomp.c
cvs rdiff -r1.4 -r1.5 src/sys/netipsec/ipsec_input.c
cvs rdiff -r1.1 -r1.2 src/sys/netipsec/ipsec_netbsd.c
cvs rdiff -r1.5 -r1.6 src/sys/netipsec/ipsec_output.c
cvs rdiff -r1.2 -r0 src/sys/netipsec/key.c src/sys/netipsec/key_debug.c
cvs rdiff -r1.1 -r0 src/sys/netipsec/key.h src/sys/netipsec/key_debug.h \
    src/sys/netipsec/key_var.h
cvs rdiff -r1.3 -r1.4 src/sys/netipsec/xform_ipip.c

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