Merge change I9c45753b into eclair

* changes:
  Clean up vCard code.