Module Name:	src
Committed By:	lha
Date:		Sat May  8 13:27:59 UTC 2004

Modified Files:
	src/crypto/dist/heimdal: configure.in
	src/crypto/dist/heimdal/kadmin: kadmind.c version4.c
	src/doc: 3RDPARTY CHANGES
	src/include/heimdal: version.h

Log Message:
Merge changes between Heimdal 0.6.1 and 0.6.2


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 src/crypto/dist/heimdal/configure.in
cvs rdiff -r1.9 -r1.10 src/crypto/dist/heimdal/kadmin/kadmind.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/heimdal/kadmin/version4.c
cvs rdiff -r1.214 -r1.215 src/doc/3RDPARTY
cvs rdiff -r1.308 -r1.309 src/doc/CHANGES
cvs rdiff -r1.15 -r1.16 src/include/heimdal/version.h

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