RELEASE-1 merge

[Egbert Eich]

Egbert Eich writes:
 > 
 > I'm planning to do the merge between the RELEASE-1 and the TM
 > branch sometimes after noon (CET) tomowrrow.
 > Currently this is held by missing final touches to the TM tree
 > by Jim and Keith and some bug I still need to look into.
 > 

The merge was delayed by network troubles yesterday but I'm planning 
to close XORG-RELEASE-1-TM branch now. I will tag the version on the 
release branch just prior to the merge and merge in TM. 
If everything goes well I'll commit the merged version to the 
RELEASE-1 branch.

Egbert.