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

[Stu Tomlinson]

commit 703d318862680994c7e45cc78fe6b9f167ad4dae
Merge: 8f50da7 2da5179
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Mon Sep 27 14:58:26 2010 +0100

    Merge branch 'master' into f14

 pidgin.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc pidgin.spec
index 93ff54e,37e2a34..cb35672
--- a/pidgin.spec
+++ b/pidgin.spec
@@@ -671,6 -671,9 +671,9 @@@ rm -rf $RPM_BUILD_ROO
  %endif
  
  %changelog
 -* Thu Sep 16 2010 Stu Tomlinson <stu at nosnilmot.com> 2.7.3-4
++* Mon Sep 27 2010 Stu Tomlinson <stu at nosnilmot.com> 2.7.3-4
+ - Rebuild against newer libedataserver
+ 
  * Mon Sep 13 2010 Dan Horák <dan[at]danny.cz> 2.7.3-3
  - drop the s390(x) ifarchs