merge of '5714dc17618d88e298075289acf0db24fc8d8179'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 18 Oct 2006 08:47:32 +0000 (08:47 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 18 Oct 2006 08:47:32 +0000 (08:47 +0000)
     and 'e9e4facf5e2c540845fd66ca9fae5809aff22e64'


Trivial merge