merge of '1b0bce82739ca8ced95d2176c9fcffa61ffb1eed'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 30 Nov 2006 10:35:42 +0000 (10:35 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 30 Nov 2006 10:35:42 +0000 (10:35 +0000)
commit082937c58c72c0c3481c7f38eeff915ffc0fe40e
treef27afa4bf6f7999d3a6f38cc16f187412492c008
parentd44e4c85f982f09bc2dec77288d8c052f164162d
parent9bd07ee8a2b3ccbc5be100bda3eb2f2e0f7985ff
Merge ... '1b0bce82739ca8ced95d2176c9fcffa61ffb1eed'
     and 'e5838be9f21da1bfd36d7676cbc48579b0af1b53'