Solve some Windows conflicts
Solve some Windows conflicts

git-svn-id: 444ed946b9c2220da791e84c3dd156a05f92db99@3457 c6295689-39f2-0310-b995-f0e70906c6a9

financeX/OpenSC,mouse07410/OpenSC,marschap/pkg-opensc,germanblanco/OpenSC,ieugen/OpenSC,marschap/pkg-opensc,martinpaljak/OpenSC,kasparsd/opensc-latvia-id,viktorTarasov/OpenSC-SM,hhonkanen/OpenSC,martinpaljak/OpenSC,dirkx/OpenSC.tokend,l1k/OpenSC,0x7678/OpenSC,germanblanco/OpenSC,adminmt/OpenSC,0x7678/myOpenSC,metsma/OpenSC,UIKit0/OpenSC,velter/OpenSC,gemini/OpenSC,LudovicRousseau/OpenSC,nmav/OpenSC,mouse07410/OpenSC,frankmorgner/OpenSC,philipWendland/OpenSC,gentoo/OpenSC,fabled/OpenSC,metsma/OpenSC,philipWendland/OpenSC,rickyepoderi/OpenSC,gentoo/OpenSC,rickyepoderi/OpenSC,rickyepoderi/OpenSC,carlhoerberg/OpenSC,dirkx/OpenSC.tokend,mtrojnar/OpenSC,Jakuje/OpenSC,CardContact/OpenSC,carlhoerberg/OpenSC,aobaid/OpenSC,nmav/OpenSC,viktorTarasov/OpenSC-SM,dirkx/OpenSC.tokend,ieugen/OpenSC,l1k/OpenSC,nmav/OpenSC,viktorTarasov/OpenSC-SM,LudovicRousseau/OpenSC,ieugen/OpenSC,gemini/OpenSC,germanblanco/OpenSC,tidatida/OpenSC,CardContact/OpenSC,jpki/OpenSC,jpki/OpenSC,0x7678/myOpenSC,0x7678/myOpenSC,financeX/OpenSC,dirkx/OpenSC,metsma/OpenSC,velter/OpenSC,kasparsd/opensc-latvia-id,mouse07410/OpenSC,fabled/OpenSC,0x7678/OpenSC,adminmt/OpenSC,kasparsd/opensc-latvia-id,dirkx/OpenSC,fabled/OpenSC,tidatida/OpenSC,gentoo/OpenSC,CardContact/OpenSC,dengert/OpenSC,AktivCo/OpenSC,fabled/OpenSC,jpki/OpenSC,Jakuje/OpenSC,velter/OpenSC,dirkx/OpenSC,aobaid/OpenSC,Jakuje/OpenSC,OpenSC/OpenSC,hongquan/OpenSC-main,AktivCo/OpenSC,marschap/pkg-opensc,aobaid/OpenSC,gentoo/OpenSC,UIKit0/OpenSC,adminmt/OpenSC,ieugen/OpenSC,aobaid/OpenSC,hhonkanen/OpenSC,hongquan/OpenSC-main,hongquan/OpenSC-main,mtrojnar/OpenSC,carlhoerberg/OpenSC,LudovicRousseau/OpenSC,dengert/OpenSC,frankmorgner/OpenSC,dirkx/OpenSC.tokend,kasparsd/opensc-latvia-id,dirkx/OpenSC.tokend,l1k/OpenSC,AktivCo/OpenSC,financeX/OpenSC,velter/OpenSC,adminmt/OpenSC,Jakuje/OpenSC,carlhoerberg/OpenSC,dirkx/OpenSC,hhonkanen/OpenSC,gemini/OpenSC,0x7678/OpenSC,dengert/OpenSC,0x7678/myOpenSC,dirkx/OpenSC,tidatida/OpenSC,0x7678/myOpenSC,financeX/OpenSC,frankmorgner/OpenSC,ieugen/OpenSC,martinpaljak/OpenSC,UIKit0/OpenSC,marschap/pkg-opensc,tidatida/OpenSC,OpenSC/OpenSC,frankmorgner/OpenSC,UIKit0/OpenSC,carlhoerberg/OpenSC,OpenSC/OpenSC,dirkx/OpenSC.tokend,mtrojnar/OpenSC,financeX/OpenSC,philipWendland/OpenSC,0x7678/OpenSC,gentoo/OpenSC