Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches acc6a2445b fix build on Darwin 13 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu