merge of '2fb7d0fb7f61a54a4005ff8d5cc52a3df21e2692'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 24 Jul 2007 12:37:55 +0000 (12:37 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 24 Jul 2007 12:37:55 +0000 (12:37 +0000)
     and 'c52428092b0739e47ca366526bbc7fb05db0b368'


Trivial merge