Module Name:	basesrc
Committed By:	thorpej
Date:		Wed Jan 24 18:18:33 UTC 2001

Modified Files:
	basesrc/crypto/dist/kame/racoon: cfparse.y ipsec_doi.c racoon.conf.5

Log Message:
Merge conflicts from notsnap20010124 import.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/kame/racoon/cfparse.y
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/kame/racoon/ipsec_doi.c \
    basesrc/crypto/dist/kame/racoon/racoon.conf.5

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