Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches e2c3a79b3e misc fixes, new package ed and mailutils 14 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu