Merge branch 'master' of git://git.exim.org/exim
authorPhil Pennock <pdp@exim.org>
Sat, 26 Mar 2011 18:08:02 +0000 (14:08 -0400)
committerPhil Pennock <pdp@exim.org>
Sat, 26 Mar 2011 18:08:02 +0000 (14:08 -0400)

Trivial merge