Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 2bdcee2f9a update to latest upstream version 11 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu