[nntpgrab/el5: 4/4] Merge branch 'master' into el5

[epienbro]

commit c1bd039313bd07c2fc87bd76a7b257d2a9a351f1
Merge: 707947d 5d19944
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Jul 20 01:08:57 2011 +0200

    Merge branch 'master' into el5

 .gitignore    |    1 +
 nntpgrab.spec |   78 ++++++++++++++++++++++++++++++++++++++++-----------------
 sources       |    2 +-
 3 files changed, 57 insertions(+), 24 deletions(-)
---