Module Name:	basesrc
Committed By:	nathanw
Date:		Sun Apr  8 20:31:42 UTC 2001

Modified Files:
	basesrc/include [nathanw_sa]: Makefile glob.h langinfo.h stdlib.h
	    string.h time.h util.h
	basesrc/include/rpc [nathanw_sa]: Makefile
Added Files:
	basesrc/include [nathanw_sa]: md2.h

Log Message:
Merge trunk onto branch.


To generate a diff of this commit:
cvs rdiff -r1.95.2.1 -r1.95.2.2 basesrc/include/Makefile
cvs rdiff -r1.11 -r1.11.12.1 basesrc/include/glob.h
cvs rdiff -r1.4 -r1.4.10.1 basesrc/include/langinfo.h
cvs rdiff -r0 -r1.1.2.1 basesrc/include/md2.h
cvs rdiff -r1.52 -r1.52.2.1 basesrc/include/stdlib.h
cvs rdiff -r1.22 -r1.22.6.1 basesrc/include/string.h
cvs rdiff -r1.25 -r1.25.2.1 basesrc/include/time.h
cvs rdiff -r1.19 -r1.19.2.1 basesrc/include/util.h
cvs rdiff -r1.5 -r1.5.2.1 basesrc/include/rpc/Makefile

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