Module Name:	cryptosrc-us
Committed By:	thorpej
Date:		Sat Mar 11 23:33:06 UTC 2000

Update of /cvsroot/cryptosrc-us/crypto-us/usr.sbin
In directory nb00:/tmp/cvs-serv970

Log Message:
Bring in latest racoon from cryptosrc-intl-20000311.


Vendor Tag:	netbsd-cryptosrc-intl
Release Tags:	cryptosrc-intl-20000311
		
U cryptosrc-us/crypto-us/usr.sbin/racoon/Makefile
C cryptosrc-us/crypto-us/usr.sbin/racoon/Makefile.inc
U cryptosrc-us/crypto-us/usr.sbin/racoon/eaytest/Makefile
U cryptosrc-us/crypto-us/usr.sbin/racoon/kmpstat/Makefile
U cryptosrc-us/crypto-us/usr.sbin/racoon/racoon/Makefile

1 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jnetbsd-cryptosrc-intl:yesterday -jnetbsd-cryptosrc-intl cryptosrc-us/crypto-us/usr.sbin