merge of '3adf66403ec7f9015d945b27947c7a236aca8ece'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 5 Sep 2007 10:41:20 +0000 (10:41 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 5 Sep 2007 10:41:20 +0000 (10:41 +0000)
commite55876c2ba87d64c803332a181643f875a93876e
tree6edb618cb2b8eaf2606fab229978ff1ede38b8be
parent3c5b824ce48be748aa0aaee336a4e39bb6e6fd79
parentdd53e4480b27768add5a152c594007686584f92e
Merge ... '3adf66403ec7f9015d945b27947c7a236aca8ece'
     and 'effa6ddcc28bd66df6e860386c4cab697628eacb'