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