[gpodder/f13/master: 3/3] Merge branch 'master' into f13

[Ville-Pekka Vainio]

commit 800f68a66dee95e046c41c736a6511a25b22aaf5
Merge: ba6c275 7031c0b
Author: Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
Date:   Sun Oct 3 18:48:48 2010 +0300

    Merge branch 'master' into f13

 gpodder.git-6a2c1baf.patch                         |   83 --------------------
 ...-92bf1255c432510f0c3b767d6c928e4e7e68de95.patch |   57 -------------
 ...-b407353260c7b7dc12b8f68c97f96f2c3eb8738b.patch |   25 ++++++
 gpodder.spec                                       |    8 ++-
 4 files changed, 32 insertions(+), 141 deletions(-)
---