Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
files c1e90da10c make xdm fly 13 lat temu
patches 1b2cf1ddff forgot the patch 11 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu