Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 1cd31f169f fix regressions from ipkg rework 15 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu