[nntpgrab/f12/master: 2/2] Merge branch 'master' into f12

[epienbro]

commit 4cbc9fdab0f6717b3029bfe93d199359daa0190d
Merge: 8194d92 d6cc9b2
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Sep 11 16:09:27 2010 +0200

    Merge branch 'master' into f12

 nntpgrab.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---