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

[Nathanael Noblet]

commit 8ad2cba5514c237adf82235d83388d8e19e9db6c
Merge: dd6fe8f 13b6e5f
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Wed Jan 26 14:09:28 2011 -0700

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

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