Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches cab30e5367 fix compile error on Darwin 13 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu