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

[Nick Bebout]

commit b186f16d134d0a04702d2561c4ef79cf535620b4
Merge: 24c0f72 4a3bbed
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Aug 13 17:35:34 2011 -0500

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

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