Merge branch 'master' into mpx

This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.

Conflicts:

	Xi/opendev.c
	dix/devices.c
	dix/dixfonts.c
	dix/getevents.c
	dix/resource.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	mi/mipointer.c
	xkb/ddxBeep.c
	xkb/ddxCtrls.c
	xkb/ddxKeyClick.c
	xkb/ddxList.c
	xkb/ddxLoad.c
	xkb/xkb.c
	xkb/xkbAccessX.c
	xkb/xkbEvents.c
	xkb/xkbInit.c
	xkb/xkbPrKeyEv.c
	xkb/xkbUtils.c

mi/mipointer.c

@@ -348,7 +348,7 @@ miPointerWarpCursor (pDev, pScreen, x, y)
 {
     miPointerPtr pPointer;
     BOOL changedScreen = FALSE;
-    
+
     if (!pDev->isMaster && !pDev->u.master)
         return;
     pPointer = MIPOINTER(pDev);
@@ -379,6 +379,7 @@ miPointerWarpCursor (pDev, pScreen, x, y)
 	pPointer->y = y;
 	pPointer->pScreen = pScreen;
     }
+
     if (changedScreen)
         UpdateSpriteForScreen (pDev, pScreen) ;
 }