[mimedefang/el5/master: 16/16] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit a5f1ece8563d1058b10a2508e8286532a6d9a28e
Merge: 9f7e864 6907f93
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Oct 6 00:13:14 2010 +0200

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

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