merge of '3c08ee728d08c7353d5bf6f79c2c549db74f468d'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 24 Oct 2007 08:13:11 +0000 (08:13 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 24 Oct 2007 08:13:11 +0000 (08:13 +0000)
     and '76ee2f24def774de27e4c0276b7e751d61c31d62'


Trivial merge