merge of '7dd06b48798640143de5d68e24ec4c8ac7f770c6'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 6 Dec 2007 12:20:28 +0000 (12:20 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 6 Dec 2007 12:20:28 +0000 (12:20 +0000)
     and 'baf350cbcd556f305c1dc7b1d828499cad03979a'


Trivial merge