Module Name:	src
Committed By:	christos
Date:		Sat Jan 14 20:20:34 UTC 2006

Modified Files:
	src/doc: CHANGES

Log Message:
mention zlib and libc/libkern merge.


To generate a diff of this commit:
cvs rdiff -r1.559 -r1.560 src/doc/CHANGES

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