merge of '9176982935d6e1cf409817d2c4c7d9252eeb17f3'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 30 Oct 2006 13:17:22 +0000 (13:17 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 30 Oct 2006 13:17:22 +0000 (13:17 +0000)
     and 'c4b03ec94efc7ce8e9de5522059ec159050d01f2'


Trivial merge