merge of '0f6db70a3ff4e230c5e3e710682fa171814afbd2'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 10:38:36 +0000 (10:38 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 10:38:36 +0000 (10:38 +0000)
commit598a944d354a9d36e9e7bf08438e68065e536092
tree17d025ce169a8949ae8c2ea61449e60179ed4447
parentb40dd10b38c9c66c1727f606187d44b6e011d662
parentddd52090b5ede88211be1599812c47b05ef0cb4a
Merge ... '0f6db70a3ff4e230c5e3e710682fa171814afbd2'
     and '5c1eabefc385a2b45280ccb72d1ae5417a56f998'