Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
files d93b039644 fix python breakage after STAGING_HOST_DIR renaming %!s(int64=10) %!d(string=hai) anos
patches d93b039644 fix python breakage after STAGING_HOST_DIR renaming %!s(int64=10) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos