Module Name:	htdocs
Committed By:	darcy
Date:		Fri May  3 08:43:47 UTC 2002

Modified Files:
	htdocs/Changes: index.html index.list

Log Message:
Cleaned up a conflict.


To generate a diff of this commit:
cvs rdiff -r1.730 -r1.731 htdocs/Changes/index.html
cvs rdiff -r1.580 -r1.581 htdocs/Changes/index.list

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