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

[Ville-Pekka Vainio]

commit 56bb6e6c4921a60499bab470a74180286a426ca0
Merge: 800f68a e20f23c
Author: Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
Date:   Sun Jan 16 00:35:25 2011 +0200

    Merge branch 'master' into f13

 .gitignore                                         |    1 +
 gpodder-use-system-pymtp.patch                     |   16 ++++++++
 ...-68aa84c11c2e1f3cca2bf32b2465c644cfd4cc15.patch |   41 ++++++++++++++++++++
 ...-75d24ee16d4a9e65fa04a872ddf66117ff5ebdb5.patch |   26 ++++++++++++
 ...-b407353260c7b7dc12b8f68c97f96f2c3eb8738b.patch |   25 ------------
 gpodder.spec                                       |   35 ++++++++++++++--
 sources                                            |    2 +-
 7 files changed, 115 insertions(+), 31 deletions(-)
---