am ee455d5c: Merge change I428a6432 into eclair

Merge commit 'ee455d5cc87fcad55e52c3c720aaf341b2dd7114' into eclair-mr2

* commit 'ee455d5cc87fcad55e52c3c720aaf341b2dd7114':
  Use scan mode introduced in VCardParser.