RELEASE-1 merged into CURRENT

[Alan Coopersmith]

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

It appears the previous convention (not always followed) was to have
the old XC/TOG/Xorg Id strings at the very top, above the copyrights,
and the XFree86 ones below the copyrights.  It sounds like it would
be best to keep the XdotOrg at the top, since the XC/TOG/Xorg ones
won't be changing any more.

-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering