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

[Stu Tomlinson]

commit 6a3fdf9db640389fd05b5317588b7b77ca1c3f8d
Merge: 703d318 9083539
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Fri Oct 22 20:52:34 2010 +0100

    Merge branch 'master' into f14

 .gitignore  |    1 +
 pidgin.spec |   15 ++++++++++++---
 sources     |    2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)
---