Merge change I652a8d7b into eclair

* changes:
  Fix ImportVCardActivity so that NPE will never occur during import.