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

[epienbro]

commit 5a1054a11233c160684b11896f004ab0f6a5ef91
Merge: b897635 bd839a7
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Aug 21 18:57:20 2010 +0200

    Merge branch 'master' into f13

 .gitignore    |    1 +
 nntpgrab.spec |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 sources       |    2 +-
 3 files changed, 55 insertions(+), 7 deletions(-)
---