Module Name:	pkgsrc
Committed By:	manu
Date:		Fri Dec 24 17:01:40 UTC 2004

Modified Files:
	pkgsrc/doc: CHANGES

Log Message:
Fix garbage commit containing conflicts


To generate a diff of this commit:
cvs rdiff -r1.8422 -r1.8423 pkgsrc/doc/CHANGES

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