merge of '03afc682e2e7c149c0114ac365f028d8a56d6113'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 13:20:39 +0000 (13:20 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 13:20:39 +0000 (13:20 +0000)
commitc8cc373fdfcf2b4a52a295dec048e875773a76f6
treec4524814b102f485fb9d9e215e7abe30f77b07d4
parenta7a62f4f74d69d3aeb4cd06a5a58258f86c28c4d
parent2eca17680866bf91d48df1c0ed11231c12454a92
Merge ... '03afc682e2e7c149c0114ac365f028d8a56d6113'
     and '699a123deec510ba1589a4e363b4f74bce2f63cc'