asf - Revision 1920178: /james/server/sandbox/merged/smtp_refactor