am 1b3a7b43: am eb114de5: Merge change I639b0f03 into eclair-mr2

Merge commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5'

* commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5':
  Make vCard exporter append neighborhood to locality field instead of extended address,