merge of '2890e8a41d4b56afa08fe908f7c38d5dc6d65269'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 18 Oct 2006 08:48:58 +0000 (08:48 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 18 Oct 2006 08:48:58 +0000 (08:48 +0000)
     and 'ab0313a11e170f4e88a966dfdf5b90ab36ca4ccb'


Trivial merge