Merge change I428a6432 into eclair

* changes:
  Use scan mode introduced in VCardParser.