merge of '3adf66403ec7f9015d945b27947c7a236aca8ece'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 5 Sep 2007 10:41:20 +0000 (10:41 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 5 Sep 2007 10:41:20 +0000 (10:41 +0000)
     and 'effa6ddcc28bd66df6e860386c4cab697628eacb'


Trivial merge