merge of '59f201d64e4c12385eca1bf3d7a312007e4ed706'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 27 Apr 2007 13:27:35 +0000 (13:27 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 27 Apr 2007 13:27:35 +0000 (13:27 +0000)
     and 'e3024909e0e2b535f0b9ad5c6dd2e59ee2b27f78'


Trivial merge