Merge change I639b0f03 into eclair-mr2

* changes:
  Make vCard exporter append neighborhood to locality field instead of extended address, per China convention.