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)
     and '699a123deec510ba1589a4e363b4f74bce2f63cc'


Trivial merge