Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 501363db19 fix build on Darwin 12 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu