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

[Stu Tomlinson]

commit 0941efbc841beb0f10c616cd84d4b6f8d1b5af1e
Merge: 80e19aa 67216ee
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Thu Jun 30 21:34:49 2011 +0100

    Merge branch 'master' into f14

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