Merging XORG-CURRENT into trunk