Merge change I8daabf26 into eclair-mr2

* changes:
  Modify vCard exporter code so that it does not emit non-Ascii type.