merge of '528c70fd35c4abbbc5ca2d29a08877e037f09e69'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 2 Oct 2007 09:16:33 +0000 (09:16 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 2 Oct 2007 09:16:33 +0000 (09:16 +0000)
     and 'ece94f3cd93d33253efe66ddd94e233b026e7d47'


Trivial merge