merge of '4751c499f21f8617037586caaf287ddbb137be0b'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 18 Oct 2007 11:35:02 +0000 (11:35 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 18 Oct 2007 11:35:02 +0000 (11:35 +0000)
     and 'ada400c152f3d86308fbd602f1ddf750e4f21570'


Trivial merge