[spamass-milter/f13/master: 9/10] Merge branch 'origin/master' (early part) into f13/master

[Paul Howarth]

commit 01170741330f3c9f38594b3fb5d2d2e72b7211db
Merge: 3455b05 947d8d4
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Sep 23 21:42:31 2010 +0100

    Merge branch 'origin/master' (early part) into f13/master
    
    Conflicts:
    	spamass-milter-0.3.1-syntax.patch
    	spamass-milter.spec

 spamass-milter-0.3.1-syntax.patch |    2 +-
 spamass-milter.spec               |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc spamass-milter-0.3.1-syntax.patch
index d99d4ee,f8980be..ed2ab63
--- a/spamass-milter-0.3.1-syntax.patch
+++ b/spamass-milter-0.3.1-syntax.patch
@@@ -14,7 -14,7 +14,7 @@@ diff -up spamass-milter-0.3.1/spamass-m
  +++ spamass-milter-0.3.1/spamass-milter.cpp	2010-03-23 16:44:54.570023100 +0000
  @@ -129,9 +129,11 @@ int daemon(int nochdir, int noclose);
   
-  static const char Id[] = "$Id: spamass-milter-0.3.1-syntax.patch,v 1.1 2010/03/25 10:58:38 pghmcfc Exp $";
 - static const char Id[] = "$Id: spamass-milter-0.3.1-syntax.patch,v 1.1 2010/03/25 10:58:40 pghmcfc Exp $";
++ static const char Id[] = "$Id: spamass-milter.cpp,v 1.90 2006/03/23 21:41:36 dnelson Exp $";
   
  +static char FilterName[] = "SpamAssassin";
  +