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

[Nick Bebout]

commit f20d9c4a00dd05498dd3c67066328977e78ba654
Merge: e974bf7 2a18fc3
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Sep 12 19:52:43 2011 -0500

    Merge branch 'master' into f14

 spamassassin.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---