merge of '05b9706d2b72277e2f1da19e3714cc4a3c8fe9ee'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 14 May 2007 11:20:11 +0000 (11:20 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 14 May 2007 11:20:11 +0000 (11:20 +0000)
     and '2a1de6d722e47e2709e4ae5bb56c646315e2ed63'


Trivial merge