merge of 'ebfa533fbc0b4ebe4011d0117987194f59487d33'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 10 Aug 2006 13:42:00 +0000 (13:42 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 10 Aug 2006 13:42:00 +0000 (13:42 +0000)
     and 'f51ee4ac99567fc6d25a7185a674fe9c9b48dd4d'


Trivial merge