merge of the XORG-CURRENT branch into trunk

[Egbert Eich]

If noone seriously objects I'm planning to merge the
XORG-CURRENT branch into the trunk of the X.Org cvs 
repository on 
	   Friday, April 23rd 2004

Everybody should prepare to commit code to this branch
before that date. 
If you are not able to do so before that date you need 
to update to HEAD

   cvs update -A

before committing.

Egbert.

PS. I apologize should you have received this message more than once.
I'm doing this crosspost to make sure I have reached everybody.