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

[Nathanael Noblet]

commit 1abc59d66b7883bdc729ec0b5f03be4024168339
Merge: 6003316 595ce13
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Tue Mar 1 08:54:22 2011 -0700

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

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