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

[Robert Scheck]

commit 42f9ea4dceb325f9bd9a6409cd269fa717b25d89
Merge: 7e745ef 1da2a72
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 8 23:19:43 2011 +0200

    Merge remote branch 'origin/master' into el5

 mimedefang.spec |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)
---