Merge branch 'master' of git://git.exim.org/exim
authorPhil Pennock <pdp@exim.org>
Sat, 22 Jan 2011 23:40:43 +0000 (18:40 -0500)
committerPhil Pennock <pdp@exim.org>
Sat, 22 Jan 2011 23:40:43 +0000 (18:40 -0500)

Trivial merge