xserver: Branch 'master'

[James Cloos]

 dix/events.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 17bccff4ce905f46c074fd8ee7c6567b1371a0a1
Author: Fernando Carrijo <fcarrijo at yahoo.com.br>
Date:   Fri Nov 14 12:36:20 2008 -0500

    [dix] Remove a duplicate statement.
    
    Signed-off-by: James Cloos <cloos at jhcloos.com>

diff --git a/dix/events.c b/dix/events.c
index ae38f24..27601b7 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -5225,8 +5225,6 @@ ProcUngrabKeyboard(ClientPtr client)
 
     grab = device->deviceGrab.grab;
 
-    grab = device->deviceGrab.grab;
-
     time = ClientTimeToServerTime(stuff->id);
     if ((CompareTimeStamps(time, currentTime) != LATER) &&
 	(CompareTimeStamps(time, device->deviceGrab.grabTime) != EARLIER) &&