merge of '377affcc88dad749e2168484cc2d59021e306d9b'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 15 Oct 2007 09:54:25 +0000 (09:54 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 15 Oct 2007 09:54:25 +0000 (09:54 +0000)
     and 'c76fe54295e0ac9fbb43c7c1d9d72d130c96f33a'


Trivial merge