merge of '5213367b0a50df561f29c1075ae072d630b19966'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 11 Dec 2006 14:57:54 +0000 (14:57 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 11 Dec 2006 14:57:54 +0000 (14:57 +0000)
     and 'ad4e848a7b84675e9075f4e9dfd733e81992a9d5'


Trivial merge