Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
src e7d2b2e754 finetune smartcard support 15 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu