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

[Peter Robinson]

Summary of changes:

  1ac9435... Rebuild against newer evolution-data-server (*)
  7117463... 3.3.2 (*)
  324121d... fix merge (*)
  a560ee6... Rebuild against newer evolution-data-server (*)
  bd45826... drop no longer needed patches (*)
  f94eb6a... Merge branch 'master' of ssh://pkgs.fedoraproject.org/ekiga (*)
  02dc1c0... cleanup spec (*)
  864afd7... fix merge

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