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

[Nick Bebout]

commit 82c2d34c170d5ef8036dd119042700c1511fdf37
Merge: 5ec3bc7 d445ae0
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Sep 8 21:16:20 2011 -0500

    Merge branch 'master' into f16

 spamassassin.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---