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

[Nathanael Noblet]

commit ccddffc2d7e421aa2b2abf83c35d5c89bf281027
Merge: 8ad2cba 595ce13
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Tue Mar 1 08:55:04 2011 -0700

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

 dspam-web.conf |   40 ++++++++++++++++++++++++++------------
 dspam.spec     |   58 +++++++++++++++++++++++++++++++++----------------------
 2 files changed, 62 insertions(+), 36 deletions(-)
---