Merge change Ifb63d236 into eclair-mr2

* changes:
  Add cancel() VCardDataBuilder, which is intended to remove a false alerm "Nested VCard code is not supported now." when importing vCard 3.0 file.