Merge change I170c8251 into eclair-mr2

* changes:
  Add tests and fix vCard code.