merge of '45ed3a3d615ea56e696ea876589e529d4f1d96e3'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 24 Oct 2007 16:06:27 +0000 (16:06 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 24 Oct 2007 16:06:27 +0000 (16:06 +0000)
     and 'd6c5f92657001382dc587916da1fbce73d196bb6'


Trivial merge