[spamassassin/f13: 6/6] Merge branch 'master' into f13

[Nick Bebout]

commit af0aa9277f8010ca64f9a9e3fa139656d5c2d17e
Merge: 1781fe5 cd4b197
Author: Nick Bebout <nb at desktop.bebout.pro>
Date:   Mon Jun 6 21:11:13 2011 -0500

    Merge branch 'master' into f13

 .gitignore        |    5 +++--
 sources           |    6 ++++--
 spamassassin.spec |   31 ++++++++++++++++++++++++-------
 3 files changed, 31 insertions(+), 11 deletions(-)
---