merge of '2d05a6d4c8545b71cddf93011420891bf70fb47e'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 3 Sep 2007 14:20:20 +0000 (14:20 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 3 Sep 2007 14:20:20 +0000 (14:20 +0000)
     and 'a5a7ee9814548b1e054d96cea845556c4b5c39e9'


Trivial merge