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

[Stu Tomlinson]

commit 86658df8146793696351729d2fbd63251c04f6c3
Merge: 052da94 ee2e355
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Fri Mar 11 12:52:00 2011 +0000

    Merge branch 'master' into f14

 .gitignore        |    1 +
 nm09-pidgin.patch |   38 ++++++++++++++++++++++++++++++++++++++
 pidgin.spec       |   12 +++++++++++-
 sources           |    2 +-
 4 files changed, 51 insertions(+), 2 deletions(-)
---