Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches a80c0be3ac add keychain package 15 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu