Merge branch 'master' of /home/git/exim into tom_dev
authorTom Kistner <tom@tahini.csx.cam.ac.uk>
Sat, 26 Mar 2011 08:49:12 +0000 (08:49 +0000)
committerTom Kistner <tom@tahini.csx.cam.ac.uk>
Sat, 26 Mar 2011 08:49:12 +0000 (08:49 +0000)

Trivial merge