merge of 'c78970f2b600a47675f4fa927b768e98773f5194'
authorGraeme Gregory <dp@xora.org.uk>
Sat, 12 Aug 2006 22:40:19 +0000 (22:40 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sat, 12 Aug 2006 22:40:19 +0000 (22:40 +0000)
     and 'c828d0949f0887cd22da336a7dc37e547064f102'


Trivial merge