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

[Nick Bebout]

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

    Merge branch 'master' into f15

 spamassassin.spec |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)
---