merge of '4b81d9aeef65c023f2c89fc6075f7491ddc274aa'
authorGraeme Gregory <dp@xora.org.uk>
Sun, 7 Oct 2007 19:46:40 +0000 (19:46 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sun, 7 Oct 2007 19:46:40 +0000 (19:46 +0000)
     and '9be09c522e7da4ef4947ce75894104d1fdfb9893'


Trivial merge