Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos
..
src e7d2b2e754 finetune smartcard support %!s(int64=14) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=11) %!d(string=hai) anos