[nntpgrab/f14: 2/3] Merge branch 'master' into f14

[epienbro]

commit 3591b4f2fc1fa1bdb85774484a62ac91e51f6ad9
Merge: 7c461d3 aa0ac7e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Nov 11 12:36:03 2011 +0100

    Merge branch 'master' into f14

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