merge of 'b281d50e8f5a095af5987accdb02c314cb86d1e0'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 7 Feb 2008 14:36:05 +0000 (14:36 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 7 Feb 2008 14:36:05 +0000 (14:36 +0000)
     and 'dd027a8b3d308568f5c47f602615755d6bbb5d86'


Trivial merge