>Module Name:	gnusrc
>Committed By:	christos
>Date:		Thu Nov 28 05:59:09 UTC 2002
>
>Modified Files:
>	gnusrc/gnu/dist/cvs/src: checkout.c client.c commit.c cvs.h history.c
>	    lock.c logmsg.c main.c mkmodules.c parseinfo.c rcs.c recurse.c
>	    server.c tag.c update.c
>
>Log Message:
>resolve conflicts. I have not tested ipv6 or gssapi.

	pserver over IPv6 is working just fine.  i have no environment to test
	gssapi.

itojun