Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
files 0db7ec2677 update and fix smardcard support for pcmcia reader %!s(int64=13) %!d(string=hai) anos
patches ac6e6711d6 fix compile under Darwin %!s(int64=13) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos