merge of '02ce8fba2c16b03770277a744efebc4f9c0f7f47'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 16 Jun 2008 11:12:45 +0000 (11:12 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 16 Jun 2008 11:12:45 +0000 (11:12 +0000)
     and '1ca4c522d6f876b0f973239befedba5f6ad6ab07'


Trivial merge