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

[Robert Scheck]

commit 3903ab73851070ff7c603b9440145ea8d8f71e21
Merge: d3c9a63 2122e55
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 31 20:11:48 2010 +0100

    Merge remote branch 'origin/master' into f13
    
    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(-)
---