Merge branch 'master' of ssh://git.exim.org/home/git/exim
authorNigel Metheringham <nigel@exim.org>
Sun, 30 Jan 2011 15:33:20 +0000 (15:33 +0000)
committerNigel Metheringham <nigel@exim.org>
Sun, 30 Jan 2011 15:33:20 +0000 (15:33 +0000)

Trivial merge