Merge branch 'master' of git://git.exim.org/exim exim-4_74_RC2
authorPhil Pennock <pdp@exim.org>
Sun, 23 Jan 2011 10:50:26 +0000 (05:50 -0500)
committerPhil Pennock <pdp@exim.org>
Sun, 23 Jan 2011 10:50:26 +0000 (05:50 -0500)

Trivial merge