[mimedefang/f13/master: 4/4] Merge remote branch 'origin/master' into f13

[Robert Scheck]

commit 81e0e8d7ae9d461583e8213c5cbff1a2cffb1e22
Merge: 4d2d888 6907f93
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Oct 6 00:10:02 2010 +0200

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

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