am 9e0da5bd: am 452a5296: Merge change I319bf9ee into eclair-mr2

Merge commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990'

* commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990':
  Make vCard exporter check invalid phone numbers and re-format them if needed.