Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 858a50f6b5 update to latest upstream, fix compile error 11 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu