merge of '9e0e042cf0a2ae14b02a20db24de2d6ac3ce71c3'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 19 Nov 2007 15:44:45 +0000 (15:44 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 19 Nov 2007 15:44:45 +0000 (15:44 +0000)
     and 'afc80db8fab3b6a16e23409594197e4000e28086'


Trivial merge