Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 éve
..
patches 1ee3ae1f9f update to latest upstream 12 éve
Makefile f14c1fc551 resolve merge conflict 11 éve