Merge change Iaa0c610a into eclair

* changes:
  Hookup building the contact header widget from deltas.