Commit 12b3495ddfbd69b2b785f26c51dbe78876c9dc00

Ran Benita 2012-04-11T01:55:50

Remove unused 'which' and 'merge' arguments Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb_desc -> xkb_keymap changes.]