Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
files 0db7ec2677 update and fix smardcard support for pcmcia reader 15 lat temu
patches ac6e6711d6 fix compile under Darwin 15 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu