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

[Ville-Pekka Vainio]

commit ba6c275b305c8809c8582a4a0a8ccfe447e2168a
Merge: e52df59 c3b4dd1
Author: Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
Date:   Sun Aug 29 01:31:29 2010 +0300

    Merge branch 'master' into f13

 .gitignore   |    1 +
 gpodder.spec |   17 ++++++++---------
 sources      |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
---