Merge change Ib977f2bd into eclair

* changes:
  Make vCard import Photo from vCard file :(