Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 9d4bc97935 remove xset calls from global config 13 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu