[libvmime/el4: 8/8] Merge remote branch 'origin/master' into el4

[Robert Scheck]

commit f2069c227fa35c81f3b7361d659da484f082ed3c
Merge: ab9554f 65d017c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Aug 17 01:14:14 2011 +0200

    Merge remote branch 'origin/master' into el4
    
    Conflicts:
    	.gitignore

 .gitignore    |    1 +
 libvmime.spec |  100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sources       |    1 +
 3 files changed, 102 insertions(+), 0 deletions(-)
---