[pidgin/f16] (8 commits) ...Fix merge conflicts

Thu Dec 29 13:07:01 UTC 2011

Summary of changes:

  9bdb1e9... Rebuild against newer evolution-data-server (*)
  32f9cd2... Sync version with f16 branch (*)
  380e94a... Rebuild against newer evolution-data-server (*)
  835ce12... Rebuild against newer evolution-data-server (*)
  036144d... - 2.10.1, includes security fixes for CVE-2011-3594, CVE-20 (*)
  462770e... - 2.10.1, includes security fixes for CVE-2011-3594, CVE-20 (*)
  995ba2b... Merge branch 'master' into f16
  d68587b... Fix merge conflicts

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