[libvmime07/f12/master: 6/6] Merge remote branch 'origin/master' into f12

[Robert Scheck]

commit 937e48ee7ce4fe5e0c01d0871183ffb1edade167
Merge: 86b9cff 2122e55
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 31 20:12:57 2010 +0100

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