[spamassassin/f14: 5/5] Merge branch 'master' into f14

[Nick Bebout]

commit e974bf75f287d86862d3f09cf828b72833439461
Merge: 08f9391 d445ae0
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Sep 8 21:17:37 2011 -0500

    Merge branch 'master' into f14

 spamassassin.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---