Merge change 21116 into eclair-dev

* changes:
  Fix photo display in ContactsListActivity.