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

[Nathanael Noblet]

commit 45fc273422f73284235aed4c99a655f5e3273445
Merge: 82a2e8d 5ca863f
Author: Nathanael d. Noblet <nathanael at gnat.ca>
Date:   Wed Sep 22 10:30:00 2010 -0600

    Merge remote branch 'origin/master' into el6/master
    
    Conflicts:
    	dspam.spec

 dspam-3.9.0-file-name.patch |   47 +++++++++++++++++++++++++++++++++++++++++++
 dspam-cron                  |    8 +++---
 dspam.spec                  |   10 +++++++-
 3 files changed, 59 insertions(+), 6 deletions(-)
---
diff --cc dspam.spec
index d36eacb,5b50f55..1b8d5a0
--- a/dspam.spec
+++ b/dspam.spec
@@@ -359,10 -361,14 +361,14 @@@ exit 
  %config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf
  
  %changelog
- * Tue Jul 13 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-7
+ * Wed Sep 22 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-9
+ - Update cron job to be silent on success
+ - Patch hash utils
+ 
+ * Tue Jul 13 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-8
  - Fix dspam data dir permissions to be writeable by mail (Reported by Jonas Pasche)
  
 -* Wed Mar 3 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-7
 +* Wed Mar 3 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-6
  - Updated dspam initscript default start position to be after DBs
  - reset initscript priorities