Module Name:	src
Committed By:	itojun
Date:		Tue Aug 26 03:25:34 UTC 2003

Update of /cvsroot/src/crypto/dist/kame/libipsec
In directory minbar.netbsd.org:/tmp/cvs-serv24480

Log Message:
KAME libipsec/libpfkey, 2003/08/26


Vendor Tag:	KAME
Release Tags:	notsnap20030826
		
U src/crypto/dist/kame/libipsec/Makefile
U src/crypto/dist/kame/libipsec/ipsec_dump_policy.c
U src/crypto/dist/kame/libipsec/ipsec_get_policylen.c
U src/crypto/dist/kame/libipsec/ipsec_set_policy.3
U src/crypto/dist/kame/libipsec/ipsec_strerror.3
U src/crypto/dist/kame/libipsec/ipsec_strerror.c
U src/crypto/dist/kame/libipsec/ipsec_strerror.h
U src/crypto/dist/kame/libipsec/libpfkey.h
U src/crypto/dist/kame/libipsec/pfkey.c
C src/crypto/dist/kame/libipsec/pfkey_dump.c
U src/crypto/dist/kame/libipsec/policy_parse.y
C src/crypto/dist/kame/libipsec/policy_token.l
C src/crypto/dist/kame/libipsec/test-policy.c

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

	cvs checkout -jKAME:yesterday -jKAME src/crypto/dist/kame/libipsec