Imported changes from xorg-server-1.2-apple to make master more current wrt file layout, build system changes, and dead code removal.
Jeremy Huddleston