Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 9d75f0d407 remove unzip dependency, use delivered cpio. some code cleanup 14 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu