[libvmime/el6: 6/6] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit e396e1bc9eb6605fa6819e1d595e489bc06dd6eb
Merge: 9be1349 65d017c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jun 26 17:11:30 2011 +0200

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

 .gitignore                           |    2 +-
 libvmime-0.9.0-include_stdio.h.patch |   12 -----
 libvmime.spec                        |   86 ++++++++++++++++-----------------
 sources                              |    2 +-
 4 files changed, 44 insertions(+), 58 deletions(-)
---