RELEASE-1 merged into CURRENT

I've just got done merging the RELEASE-1 branch into CURRENT.

I've tagged the version topmost version prior to the commit to
be sure we can get back if problems seem to occur.
I've done a full build (including docs and package creation)
and everything seemed to be OK (at least for Linux-x86).

There are a few issues:

1. I had the usual spurious conflicts from cvs IDs. Keeping XdotOrg:
   and XFree86: IDs in close vicinity is like calling for trouble.

2. One conflict I have not been able to resolve was the Japanese
   Credits.rtf from the Darwin project. There were simply too many
   conflicts and I don't speak RTF. I would like to ask Kaleb to
   have a look at this file (I've used the version from the RELEASE-1
   branch loosing all the changes that went into the CURRENT branch
   since the split).

3. I've used the new ChangeLog file format Keith has been proposing.
   (I've removed the long list of files, instead I've added the 
   ChangeLog from the RELEASE-1 branch (indented by 1).
   If you agree on this format we need to document how to create
   changelog files and I will convert the previous changelog entries
   to the new format (once I've figured out how to do this without
   too much hassle).

4. I will investigate how to merge the CURRENT branch into HEAD
   without causing too much headache for others.
   I would like to know how people feel about this (ie. if there
   are objections).

Cheers,
	Egbert.