merge of '73862e82dbaa87f0d1f27cd2641785c761b41227'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 20 Nov 2007 13:39:10 +0000 (13:39 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 20 Nov 2007 13:39:10 +0000 (13:39 +0000)
     and 'ada36533264ca20fee46b2e51218c9ddf7b71126'


Trivial merge