ebe56c8 Merge branch 'master' into f14

Merged and Committed by nb 12 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	spamassassin.spec
    
        
file added
+13
file modified
+72 -2