merge of '3a2c550685a02d29aea9d584a7fbab44de0f8f32'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 11 Mar 2008 11:53:46 +0000 (11:53 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 11 Mar 2008 11:53:46 +0000 (11:53 +0000)
     and '790e5a95d24c755262b00482793b63d1f0efe440'


Trivial merge