[meego-panel-people/f16] (3 commits) ...fix merge

[Peter Robinson]

Summary of changes:

  14cca8a... Rebuild against newer evolution-data-server (*)
  572ed69... 0.2.9 (*)
  aeb2e6c... fix merge

(*) This commit already existed in another branch; no separate mail sent