Keyboard not working in X

[Bradley Alexander <storm@tux.org>]

I have two machines, both running unstable. On the one I dist-upgraded over the weekend, I attempt to log in but each keystroke changes the resolution of the X display.

In the X messages, I see the following messages:

    xkb_keycodes             { include "xfree86+aliases(qwerty)" };
    xkb_types                { include "complete" };
    xkb_compatibility        { include "complete" };
    xkb_symbols              { include "pc(pc105)+us" };
    xkb_geometry             { include "pc(pc104)" };
expected keysym, got XF86_Switch_VT_1: line 8 of xfree86
expected keysym, got XF86_Switch_VT_2: line 11 of xfree86
expected keysym, got XF86_Switch_VT_3: line 14 of xfree86
expected keysym, got XF86_Switch_VT_4: line 17 of xfree86
expected keysym, got XF86_Switch_VT_5: line 20 of xfree86
expected keysym, got XF86_Switch_VT_6: line 23 of xfree86
expected keysym, got XF86_Switch_VT_7: line 26 of xfree86
expected keysym, got XF86_Switch_VT_8: line 29 of xfree86
expected keysym, got XF86_Switch_VT_9: line 32 of xfree86
expected keysym, got XF86_Switch_VT_10: line 35 of xfree86
expected keysym, got XF86_Switch_VT_11: line 38 of xfree86
expected keysym, got XF86_Switch_VT_12: line 41 of xfree86
expected keysym, got XF86_Ungrab: line 45 of xfree86
expected keysym, got XF86_ClearGrab: line 48 of xfree86
expected keysym, got XF86_Next_VMode: line 51 of xfree86
expected keysym, got XF86_Prev_VMode: line 54 of xfree86
The XKEYBOARD keymap compiler (xkbcomp) reports:
> Warning:          Multiple interpretations of "NoSymbol+AnyOfOrNone(all)"
>                   Using last definition for duplicate fields
> Warning:          Multiple interpretations of "NoSymbol+AnyOfOrNone(all)"
>                   Using last definition for duplicate fields
[this is repeated multiple times]

I checked the md5sums of both /usr/bin/xkbcomp and /etc/X11/xkb/keymap/xfree86 and they match with the other box which works.

I tried doing dpkg-reconfigures on 

xkb-data
xlibs
xlibs-data
xlibs-dev
xlibs-static-dev
xbase-clients

to no avail. What can I do to fix this issue?

Thanks,
--b