[pidgin/f17] (5 commits) ...Merge branch 'f17'

[Stu Tomlinson]

Summary of changes:

  a1b9599... Merge branch 'f17' into f16 (*)
  297bef5... Merge branch 'f16' of ssh://pkgs.fedoraproject.org/pidgin i (*)
  5361f0c... Merge branch 'f15' of ssh://pkgs.fedoraproject.org/pidgin i (*)
  5e71687... Merge branch 'f16' (*)
  aa34525... Merge branch 'f17' (*)

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