[nntpgrab/el6/master: 13/13] Merge branch 'master' into el6

[epienbro]

commit e48196d3310b073b8dcf4a938132e6822fface55
Merge: 401382b 232dba3
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Aug 21 23:34:40 2010 +0200

    Merge branch 'master' into el6

 .gitignore    |    3 +-
 nntpgrab.spec |  128 ++++++++++++++++++++++++++++++++++++++++++--------------
 sources       |    2 +-
 3 files changed, 99 insertions(+), 34 deletions(-)
---