swappable listen
cleanup
Merge branch 'master' into portable

Conflicts:
	smtpd/parse.y