Merge branch 'master' into xi2

Conflicts:
	Xi/chdevhier.c
	include/input.h

1 files changed, 1 insertions, 1 deletions

diff --git a/mi/mieq.c b/mi/mieq.c
index 0dedbee77..08444e166 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -438,7 +438,7 @@ mieqProcessInputEvents(void)
         mieqProcessDeviceEvent(dev, event, screen);
 
         /* Update the sprite now. Next event may be from different device. */
-        if (event->u.any.type == ET_Motion && (master || dev->isMaster))
+        if (event->u.any.type == ET_Motion && master)
             miPointerUpdateSprite(dev);
 
 #ifdef XQUARTZ