import from HEAD:
authorfcusack <fcusack>
Tue, 9 May 2006 08:13:03 +0000 (08:13 +0000)
committerfcusack <fcusack>
Tue, 9 May 2006 08:13:03 +0000 (08:13 +0000)
update cardops keystring2keyblock method to take a card_info_t *
instead of some of its fields


Trivial merge