diff -u xorg-server-1.7.6/debian/changelog xorg-server-1.7.6/debian/changelog
--- xorg-server-1.7.6/debian/changelog
+++ xorg-server-1.7.6/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.7.6-2ubuntu8) lucid-proposed; urgency=low
+
+  * debian/local/64-xorg-xkb.rules: Ignore XKBMODEL=="SKIP" and
+    XKBVARIANT=="U.S. English", which happen to get into
+    /etc/default/console-setup in some cases like the VMWare automatic
+    installer. (LP: #548891)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 27 Apr 2010 22:00:19 +0200
+
 xorg-server (2:1.7.6-2ubuntu7) lucid; urgency=low
 
   * Drop 117_fix_crash_with_createglyphset.patch
diff -u xorg-server-1.7.6/debian/local/64-xorg-xkb.rules xorg-server-1.7.6/debian/local/64-xorg-xkb.rules
--- xorg-server-1.7.6/debian/local/64-xorg-xkb.rules
+++ xorg-server-1.7.6/debian/local/64-xorg-xkb.rules
@@ -7,2 +7,7 @@
 
+# ignore "SKIP" keyboard model, which is a magic value from console-setup's debconf
+ENV{XKBMODEL}=="SKIP", ENV{XKBMODEL}=""
+# Similarly, ignore this broken default variant, which breaks keyboard entirely
+ENV{XKBVARIANT}=="U.S. English", ENV{XKBVARIANT}=""
+
 LABEL="xorg_xkb_end"