am 387e73bd: Merge change Ib977f2bd into eclair

Merge commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7' into eclair-mr2

* commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7':
  Make vCard import Photo from vCard file :(