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

[Nathanael Noblet]

commit 34dccaab45eca8f1931076100b25bf164e9f2eee
Merge: cdc77fe 595ce13
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Tue Mar 1 09:07:08 2011 -0700

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

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