Merge change I1fb066b0 into eclair-mr2

* changes:
  Rename VCardTest.java to VCardImportTest.java.