merge of '1d2da7c2a64cb6782d396f30259020ad4254cf69'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 15:38:17 +0000 (15:38 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 15:38:17 +0000 (15:38 +0000)
     and 'fd6c3104412672124350e987af3ff8736304f817'


Trivial merge