[syncevolution/f16] (8 commits) ...fix merge

[Peter Robinson]

Summary of changes:

  a252d7f... Rebuild against newer evolution-data-server (*)
  2e47b05... Sync version with f16 branch (*)
  6337163... 1.1.99.7 (*)
  1e737cd... fix merge (*)
  20daefb... Own syncevolution directory - fixes RHBZ 744929 (*)
  2d57702... add patch to fix build (*)
  15b4f37... Merge branch 'master' into f16
  5a47e08... fix merge

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