[libvmime07/el5/master: 8/8] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 4132f9b8597dcde048d2e58fc134514f9c529fa8
Merge: 6fea362 2122e55
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 31 20:15:56 2010 +0100

    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	libvmime07-0.7.1-allow-alternate-encodings.patch
    	libvmime07.spec

 libvmime07-0.7.1-allow-alternate-encodings.patch |   18 +++++++++++++++---
 libvmime07.spec                                  |    5 ++++-
 2 files changed, 19 insertions(+), 4 deletions(-)
---