Added by Anthony Liguori almost 13 years ago
Merge remote-tracking branch 'alon/pull-libcacard-1' into staging