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

[Stu Tomlinson]

commit 80e19aaf347c37907a5aba124cef0f92a481bc62
Merge: 86658df 467d7d6
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Mon Jun 13 18:59:15 2011 +0100

    Merge branch 'master' into f14

 .gitignore                               |    1 +
 nm09-more.patch                          |   37 +++++++++++++++++++++++++++++
 nm09-pidgin.patch                        |   38 ------------------------------
 pidgin-2.8.0-gevolution-compilefix.patch |   20 +++++++++++++++
 pidgin.spec                              |   24 +++++++++++++++---
 sources                                  |    2 +-
 6 files changed, 79 insertions(+), 43 deletions(-)
---