[perl-Mail-SPF/el6/master: 6/6] Merge branch 'master' into el6

[Nick Bebout]

commit 68ee90bd743355ff2703c9a9147f948a7325538b
Merge: 1f49f17 fbb700d
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sun Dec 5 21:29:21 2010 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore         |    2 +-
 perl-Mail-SPF.spec |   13 +++++++++++--
 sources            |    2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 18c73fe,e100478..6bdd2b4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,1 @@@
- Mail-SPF-v2.006.tar.gz
 -/Mail-SPF-v2.007.tar.gz
++Mail-SPF-v2.007.tar.gz