Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 0755318d75 update xkeyboard-config, pregenerate xml files, so no dependency to intltool exist 11 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu