Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches f81ec79b21 forgot to add my patch 11 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu