Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 6d7a7f4776 FreeBSD compatibility patches 15 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu