merge of '4c89fe83f0f196ebd6c0ae47cf90bf2134df3c1e'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 20 Sep 2007 13:35:46 +0000 (13:35 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 20 Sep 2007 13:35:46 +0000 (13:35 +0000)
     and 'eee5593805c1b699d11b41c5bf39860df0d24ca6'


Trivial merge