merge of '5afb82396b9f0ccbe4e10d1ddc30d5b64679639d'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 24 Oct 2007 09:28:01 +0000 (09:28 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 24 Oct 2007 09:28:01 +0000 (09:28 +0000)
     and 'a79d90fb0466aeb7b196175fb36831acfe94c694'


Trivial merge