[pidgin/f14: 2/2] Merge branch 'master' into f14

[Stu Tomlinson]

commit bdebccf7214a45e73524ec9fe8c4360a1d12e59a
Merge: dab4ab4 c25745a
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Fri Jul 1 01:35:57 2011 +0100

    Merge branch 'master' into f14

 pidgin-2.8.0-gevolution-compilefix.patch |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)
---