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

[Nick Bebout]

commit 1914187c9a2104f1fd664da427181020dd96424d
Merge: f20d9c4 f855708
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Sep 12 19:54:00 2011 -0500

    Merge branch 'master' into f14

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