[nntpgrab/f12/master: 3/4] Merge branch 'master' into f12

[epienbro]

commit a86e3f105870f3a84a0ab4dc91e1306e4afcd400
Merge: 3307c64 8892539
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Sep 6 21:57:43 2010 +0200

    Merge branch 'master' into f12

 nntpgrab.spec                    |    9 +++-
 nntpgrab_0_6_90_commit1722.patch |  111 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 119 insertions(+), 1 deletions(-)
---