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

[Nick Bebout]

commit 5417669bb451d0caa799ef7ab15fc1c9d3acba3e
Merge: 3fbdcd2 f855708
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Sep 12 19:54:01 2011 -0500

    Merge branch 'master' into f15

 spamassassin.service |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---