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

[Nathanael Noblet]

commit dd6fe8fbb5d9a641daf7cf60f3bdd22da7c8f405
Merge: aa4ed7e 2258698
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Wed Jan 26 12:00:31 2011 -0700

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

 dspam-3.9.0-docs.patch      |   45 +++++++++++++++++++++++++++++++++++++++++++
 dspam-3.9.0-dspamsock.patch |   19 ++++++++++++++++++
 dspam.spec                  |   16 ++++++++++++++-
 3 files changed, 79 insertions(+), 1 deletions(-)
---