merge of '1b0bce82739ca8ced95d2176c9fcffa61ffb1eed'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 30 Nov 2006 10:35:42 +0000 (10:35 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 30 Nov 2006 10:35:42 +0000 (10:35 +0000)
     and 'e5838be9f21da1bfd36d7676cbc48579b0af1b53'


Trivial merge