merge of '4f64cc3dea865c4685261d303267199508fc3487'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 30 Oct 2007 15:44:53 +0000 (15:44 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 30 Oct 2007 15:44:53 +0000 (15:44 +0000)
commit2e9c16b3413ffd1a4fd4f6d34e60c052e3179eee
treec9b3d63bce6d6123e649014ad37966cf0a46e4e2
parentbdfe100ca6abd199594d3171a5911e4223da49a0
parentff6db4227501fef91b4fc414b85b5f547e677247
Merge ... '4f64cc3dea865c4685261d303267199508fc3487'
     and '651defa9295237cd8d3fc50ef043ba40c901030c'