[spamass-milter/el6/master: 10/10] Merge remote branch 'origin/master' into el6/master

[Paul Howarth]

commit 802eb71b2995b69d8233a76852bada1c948498f9
Merge: 0160118 4f96a30
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Sep 23 21:52:16 2010 +0100

    Merge remote branch 'origin/master' into el6/master
    
    Conflicts:
    	spamass-milter-0.3.1-syntax.patch
    	spamass-milter.spec

 spamass-milter-0.3.1-ipv6.patch   |  297 +++++++++++++++++++++++++++++++++++++
 spamass-milter-0.3.1-syntax.patch |    2 +-
 spamass-milter.spec               |   10 +-
 3 files changed, 307 insertions(+), 2 deletions(-)
---