Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches e46b673c12 fix cpio build 12 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu