Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 578f218b3e fix lvm package compile 10 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu