merge of 'b18cfa28782c48bc33a60cf6d234ad4539f49fbb'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 7 Jun 2007 09:28:02 +0000 (09:28 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 7 Jun 2007 09:28:02 +0000 (09:28 +0000)
     and 'c2872048d9bdc1e2243686a61bf7980cd063f42e'


Trivial merge