merge of '9e98fb14bc16730c2bbc97c1720259cb479ac8fa'
authorGraeme Gregory <dp@xora.org.uk>
Sat, 12 Aug 2006 22:39:21 +0000 (22:39 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sat, 12 Aug 2006 22:39:21 +0000 (22:39 +0000)
     and 'b63cff7dc0ce768b721311fb1eca7e9ef45e7ed9'


Trivial merge