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

[Nathanael Noblet]

commit 82a2e8da808d553cc7cf238aa5a3f97969d82211
Merge: db043f1 fc84043
Author: Nathanael d. Noblet <nathanael at gnat.ca>
Date:   Wed Sep 22 10:28:47 2010 -0600

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

 dspam.spec |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --cc dspam.spec
index 5fa4b27,d6652d1..d36eacb
--- a/dspam.spec
+++ b/dspam.spec
@@@ -251,8 -251,7 +251,7 @@@ don
  
  %post
  /sbin/chkconfig --add %{name}
- 
 -if [ $1 -gt 1 ];  then
 +if [ $1 -gt 1 ]; then
  /sbin/chkconfig %{name} resetpriorities
  fi