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

[Jesse Keating]

commit 5ec3bc72586e4379640c8615c12023db6b5876b2
Merge: 0bf7c16 c4e0f25
Author: Jesse Keating <jkeating at redhat.com>
Date:   Wed Sep 7 11:26:59 2011 -0700

    Merge branch 'master' into f16

 spamassassin.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---