Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
files d93b039644 fix python breakage after STAGING_HOST_DIR renaming 10 lat temu
patches d93b039644 fix python breakage after STAGING_HOST_DIR renaming 10 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu