[spamassassin/f13/master] (7 commits) ...Merge branch 'master' into f13

[Nick Bebout]

Summary of changes:

  7bc5114... Fix sa-update sysconfig script line wrapping (*)
  394ef9b... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  8f17aef... Restart spampd on sa-update Patch by Simon Matter <simon.ma (*)
  7a63292... Replace @@VERSION@@ with current saversion (*)
  f19012e... - replace @@VERSION@@ with current saversion - restart spam (*)
  94d8edd... Oops, I left off svn in the Release of 3.3.2-0.4.svn1071394 (*)
  1781fe5... Merge branch 'master' into f13

(*) This commit already existed in another branch; no separate mail sent