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

[Stu Tomlinson]

commit 1455165aff03bc67857d23f158da9b49f3ece2b6
Merge: 93c8125 9f1c07b
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Tue Feb 22 01:30:49 2011 +0000

    Merge branch 'master' into f14

 .gitignore  |    1 +
 pidgin.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---