Merge branch 'master' of git+ssh://git.freedesktop.org/git/xkeyboard-config
[xorg/xkeyboard-config] / rules / base.o_k.part