merge xkeyboard-config 2.29.
Resolve conflicts.
merge xkeyboard-config 1.4
initial import of xkeyboard-config-1.3