[pidgin/f16: 7/8] Merge branch 'master' into f16

[Stu Tomlinson]

commit 995ba2bd007da92213bc908c04e695084d1ffbcf
Merge: b7d4192 462770e
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Thu Dec 29 13:02:37 2011 +0000

    Merge branch 'master' into f16

 .gitignore                             |    1 +
 pidgin-2.10.1-fix-msn-ft-crashes.patch |   33 ++++++++++++++++++++++++++++++++
 pidgin.spec                            |   21 +++++++++++++++++++-
 sources                                |    2 +-
 4 files changed, 55 insertions(+), 2 deletions(-)
---