merge of '91782f0ec824ced8214a20e5d2f8b080c82c25d5'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 26 Feb 2008 18:02:18 +0000 (18:02 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 26 Feb 2008 18:02:18 +0000 (18:02 +0000)
     and 'bde94cf8dad73aae4dad904a84e442fae7b410f9'


Trivial merge