merge of '6ef8b55fe81238d3e4be14ca1cbf2f23ab7ee8a1'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 13 Nov 2007 15:53:40 +0000 (15:53 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 13 Nov 2007 15:53:40 +0000 (15:53 +0000)
     and '92881558b2b1ee88b0d0bb08428f57e67a1250c6'


Trivial merge