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

[Nathanael Noblet]

commit 824bd8b082c6303855803b9895f952ad7273d288
Merge: c0fcaf2 fc84043
Author: Nathanael d. Noblet <nathanael at gnat.ca>
Date:   Wed Sep 22 10:25:03 2010 -0600

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

 dspam.spec |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --cc dspam.spec
index 5fa4b27,d6652d1..c60c236
--- 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