merge of '10a55acff544b045f87ede432759d7fbae98904b'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 1 Aug 2006 14:04:57 +0000 (14:04 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 1 Aug 2006 14:04:57 +0000 (14:04 +0000)
     and '71fb6bfd56d55587183a72957f4c5cad49b369fc'


Trivial merge