merge of '26eef9824538dbeb602a9de19e679d9024dabece'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 12 Feb 2007 21:51:42 +0000 (21:51 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 12 Feb 2007 21:51:42 +0000 (21:51 +0000)
     and '55734c4486f119a88c9e73fd18da42abdf708f5b'


Trivial merge