Bug#931332: xserver-xorg-core: X crash on keyboard remapping

[Samuel Thibault]

Just for the record: the patch is commited in master for 1.21, and in
server-1.20-branch for 1.20.6.

Samuel