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