[meego-panel-myzone/f16] (4 commits) ...fix merge

[Peter Robinson]

Summary of changes:

  e5efbea... Rebuild against newer evolution-data-server (*)
  9af3909... 0.2.9 (*)
  affd9d2... fix merge (*)
  9b9a6bf... fix merge

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