Merge branch 'master' into mpx

Conflicts:

	Xi/extinit.c
	Xi/grabdev.c
	Xi/setmode.c
	Xi/ungrdev.c
	dix/devices.c
	dix/events.c
	dix/getevents.c
	include/dix.h
	mi/midispcur.c
	mi/misprite.c
	xkb/xkbActions.c
	xkb/xkbEvents.c
	xkb/xkbPrKeyEv.c

1 files changed, 1 insertions, 0 deletions

diff --git a/mi/mipointer.c b/mi/mipointer.c
index 8dc7c7f5f..4439ffcee 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -372,6 +372,7 @@ miPointerWarpCursor (pDev, pScreen, x, y)
 	pPointer->y = y;
 	pPointer->pScreen = pScreen;
     }
+    UpdateSpriteForScreen (pDev, pScreen) ;
 }
 
 /*