--- a/open-src/xserver/xorg/KB_EncodingAtXCrash.patch	Sat Jan 10 10:35:32 2009 -0800
+++ b/open-src/xserver/xorg/KB_EncodingAtXCrash.patch	Thu Jan 15 12:55:00 2009 -0800
@@ -1,10 +1,9 @@
---- hw/xfree86/common/xf86Events.c	Sat Oct 20 10:14:20 2007
-+++ hw/xfree86/common/xf86Events.c	Sat Oct 20 10:15:59 2007
-@@ -1456,8 +1456,32 @@
- #endif
+diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Events.c hw/xfree86/common/xf86Events.c
+--- hw/xfree86/common/xf86Events.c	2008-09-23 11:24:58.000000000 -0700
++++ hw/xfree86/common/xf86Events.c	2008-09-24 20:24:56.137289000 -0700
+@@ -764,6 +764,31 @@ xf86SigHandler(int signo)
+   xorg_backtrace();
  
-   xorg_backtrace();
--    
    FatalError("Caught signal %d.  Server aborting\n", signo);
 +
 +/* CR 6545884 If server crashes keyboard left in un-encoded mode*/
@@ -33,4 +32,4 @@
 +    
  }
  
- #ifdef MEMDEBUG
+ static void