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


Trivial merge