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

[Nick Bebout]

commit ebe56c8fdaaa325dcaf96cd643f304715456e18c
Merge: 891c3a9 4a3bbed
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Aug 13 17:36:35 2011 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	spamassassin.spec

 spamassassin.service |   13 +++++++++
 spamassassin.spec    |   74 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 85 insertions(+), 2 deletions(-)
---