[dspam/el6/master: 2/2] Merge remote branch 'origin/master' into el6/master

[Nathanael Noblet]

commit cdc77fe7931329e486d470738a88eb42a657ebb2
Merge: 0ebdcd2 13b6e5f
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Wed Jan 26 14:10:30 2011 -0700

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

 dspam-web.conf |    3 ++-
 dspam.spec     |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---