[mimedefang/el6/master: 6/6] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit b0067a45012cea3df53ab796379632af4b5549e9
Merge: 9b3c4c0 6907f93
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Oct 6 00:12:02 2010 +0200

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	mimedefang.spec
    	sources

 .gitignore      |    2 +-
 mimedefang.spec |    9 ++++++---
 sources         |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---