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

[Nick Bebout]

commit e7e0ea3c3f9df7a9fde08b2f863251af6c71dc0a
Merge: 0083d2b f855708
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Sep 12 19:53:55 2011 -0500

    Merge branch 'master' into f16

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