Merge branch 'master' of ssh://git.exim.org/home/git/exim
authorDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 17 Dec 2010 19:03:37 +0000 (19:03 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 17 Dec 2010 19:03:37 +0000 (19:03 +0000)

Trivial merge