Merge remote-tracking branch 'alon/pull-libcacard.afe' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 29 Jul 2011 14:43:36 +0000 (09:43 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 29 Jul 2011 14:43:36 +0000 (09:43 -0500)
1  2 
configure

diff --cc configure
Simple merge