Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 éve
..
patches c82dab24ed fix cross-compile on Darwin 10 éve
Makefile f14c1fc551 resolve merge conflict 10 éve