Merge branch 'log_retry'
authorPhil Pennock <pdp@exim.org>
Mon, 21 Nov 2011 03:02:16 +0000 (22:02 -0500)
committerPhil Pennock <pdp@exim.org>
Mon, 21 Nov 2011 03:02:16 +0000 (22:02 -0500)

Trivial merge