Merge remote-tracking branch 'alon/pull-libcacard-1' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 15 Jun 2011 14:03:49 +0000 (09:03 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 15 Jun 2011 14:03:49 +0000 (09:03 -0500)

Trivial merge