Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore
    	proftpd.conf
    	proftpd.spec
    	sources
    
    This is a version update but it does fix a number of security issues
    and I consider the minor upheaval of the version update to be a lesser
    evil than the possibililty of getting backported security fixes wrong.