Merge change I5d30aa18 into eclair

* changes:
  Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.