[nntpgrab/f13/master: 12/12] Merge branch 'master' into f13

[epienbro]

commit 3b22d1b10090ff2788c5511138ea590008d88c28
Merge: 5a1054a 232dba3
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Aug 21 23:14:10 2010 +0200

    Merge branch 'master' into f13

 nntpgrab.spec |   74 +++++++++++++++++++++++++++++++++-----------------------
 sources       |    2 +-
 2 files changed, 45 insertions(+), 31 deletions(-)
---