xserver: Branch 'server-1.4-branch'

[Julien Cristau]

 config/x11-input.fdi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 2bf6cb3074d9c0dcd706e8e083747c6d84b70e30 (from fd4dc5a98e600b267ee22a3fb47c093c3e1b26d6)
Author: Julien Cristau <jcristau at debian.org>
Date:   Tue Aug 21 18:17:35 2007 +0200

    config: fix default xkb model (pc105, not keyboard)
    (cherry picked from commit 6ef4ecd82670c37a354243166750d76a97959c8b)

diff --git a/config/x11-input.fdi b/config/x11-input.fdi
index 7f516ca..c390706 100644
--- a/config/x11-input.fdi
+++ b/config/x11-input.fdi
@@ -16,7 +16,7 @@
       <!-- If we're using Linux, we use evdev by default (falling back to
            keyboard otherwise). -->
       <merge key="input.x11_driver" type="string">keyboard</merge>
-      <merge key="input.xkb.model" type="string">keyboard</merge>
+      <merge key="input.xkb.model" type="string">pc105</merge>
       <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
              string="Linux">
         <merge key="input.x11_driver" type="string">evdev</merge>