merge of '32258899edefeae4673df2f3d5313ae6fce9059e'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 27 Apr 2007 15:33:14 +0000 (15:33 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 27 Apr 2007 15:33:14 +0000 (15:33 +0000)
     and 'fd2646918c894cb698291c811968bd0cd4ae9b89'


Trivial merge