Merge change I6ce46417 into eclair-mr2

* changes:
  Clean-up vCard code.