merge of '8bbb5937470272e0025b99f897039527f0b1bf70'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 10 Jul 2007 22:06:33 +0000 (22:06 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 10 Jul 2007 22:06:33 +0000 (22:06 +0000)
     and 'c4c04abd2d37ccffd14f985a7cb5384d5e73cfb0'


Trivial merge