[dspam/el5/master: 9/9] Merge remote branch 'origin/master' into el5/master

[Nathanael Noblet]

commit aa4ed7ec17715df5bc94612beb2430611c8e1ed3
Merge: d1920b2 5ca863f
Author: Nathanael d. Noblet <nathanael at gnat.ca>
Date:   Wed Sep 22 10:32:01 2010 -0600

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

 dspam-3.9.0-file-name.patch |   47 +++++++++++++++++++++++++++++++++++++++++++
 dspam-cron                  |    8 +++---
 dspam.spec                  |    8 ++++++-
 3 files changed, 58 insertions(+), 5 deletions(-)
---