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

[Stu Tomlinson]

commit a9d86c61ae51336f9ca2209858ccb7512c7735a2
Merge: 6a3fdf9 c48aa37
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Mon Nov 1 16:38:38 2010 +0000

    Merge branch 'master' into f14

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