Added by Anthony Liguori over 12 years ago
Merge remote-tracking branch 'alon/pull-libcacard.afe' into staging