commit 297bef568da9ba86f83f4c1964fab18302876935 Merge: 1ddeb8b a1b9599 Author: Stu Tomlinson <stu at nosnilmot.com> Date: Thu Jul 5 18:09:52 2012 +0100 Merge branch 'f16' of ssh://pkgs.fedoraproject.org/pidgin into f16 ---