merge of '2f6207e3eb3b5de784c7adf20365c86deec46ec7'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 2 Apr 2007 13:51:26 +0000 (13:51 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 2 Apr 2007 13:51:26 +0000 (13:51 +0000)
     and 'abc5baea00271b2f96a71b4590a17c2027c89a00'


Trivial merge