Merge commit 'origin/upstream' into juha-devel
[qemu] / x_keymap.h
2009-03-03 aliguoriFix SDL on evdev hosts (Anthony Liguori)