Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 179597b65e fix lemote yeelong compile 12 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu