merge of '58cd98da4adf334b3a3a9aa2ca78999544c51106'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 5 Feb 2008 14:38:55 +0000 (14:38 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 5 Feb 2008 14:38:55 +0000 (14:38 +0000)
     and 'bbb0c0e6195245b39f66759ad685ab747657d131'


Trivial merge