Merge change I0bb240dc into eclair

* changes:
  Fix a sample code commented out, complying with the new vCard implementation.