merge of 'e0d0eae226575307c1c07c99b453f1eada2a1773'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 14 Jun 2005 23:52:17 +0000 (23:52 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 14 Jun 2005 23:52:17 +0000 (23:52 +0000)
     and 'fbff716710a0fbeca3a08e0e2b2401a4b5bbaec6'


Trivial merge