Merge remote-tracking branch 'mjesec/master'

Conflicts:
	src/ccid/ccid-driver.c

diff --cc src/ccid/ccid-driver.c
index e440167,7f6a6c6..20b0695
--- 1/src/ccid/ccid-driver.c
--- 2/src/ccid/ccid-driver.c
+++ b/src/ccid/ccid-driver.c
@@@ -506,7 -506,7 +506,7 @@@ parse_ccid_descriptor (ccid_driver_t ha
        DEBUGOUT ("this drivers requires that the reader supports T=1, "
                  "TPDU or APDU level exchange and auto configuration - "
                  "this is not available\n");
-       return -1;
 -//      return -1;
++      return -1; // XXX dpavlin - fixme for 5312 v2?
      }