Module Name: doc Committed By: abs Date: Mon Mar 22 11:18:31 UTC 1999 Modified Files: doc: CHANGES Log Message: Hmm - someone committed a version of this complete with conflicts. Remove conflicts.