Peter Hutterer f367285fd5 Merge branch 'master' into mpx ... Conflicts: Xi/exevents.c dix/devices.c dix/getevents.c include/dix.h mi/mieq.c		2007-08-12 15:31:10 +09:30
..
Makefile.am
xtrapddmi.c
xtrapdi.c
xtrapdiswp.c
xtrapditbl.c