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

[epienbro]

commit bd8374d53dfcd1ca25ab264c33b732bd6807f34e
Merge: 18ec343 5d19944
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Jul 20 01:07:46 2011 +0200

    Merge branch 'master' into f14

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