[dspam/el5/master: 6/6] Merge remote-tracking branch 'origin/master' into el5

[Nathanael Noblet]

commit 86ab539b4e8ecade9af714cb6ac9c97ca00a3231
Merge: ccddffc 0249b41
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Thu Mar 3 11:59:47 2011 -0700

    Merge remote-tracking branch 'origin/master' into el5

 dspam-3.9.0-configure.patch |  194 +++++++++++++++++++++++++++++++++++++++++++
 dspam.spec                  |   32 +++++---
 2 files changed, 214 insertions(+), 12 deletions(-)
---