Add Xorg server patch to make Mesa-10 work

Also a quick fix to mesa - hopefully this will be upsteamed soon