merge of '68b307acdcebbfa76e48b811ca400ec5c07e768c'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 14 Mar 2008 16:51:19 +0000 (16:51 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 14 Mar 2008 16:51:19 +0000 (16:51 +0000)
     and '95d7aafb111c8d8a347b6e51672855a431552234'


Trivial merge