Merge branch 'master' of ssh://git.exim.org/home/git/exim
authorTodd Lyons <tlyons@exim.org>
Tue, 16 Oct 2012 03:21:07 +0000 (20:21 -0700)
committerTodd Lyons <tlyons@exim.org>
Tue, 16 Oct 2012 03:21:07 +0000 (20:21 -0700)

Trivial merge