merge of '8f416f1cd7eff65f0a75eb6db80cd5f7291ad959'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 15:20:29 +0000 (15:20 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 15:20:29 +0000 (15:20 +0000)
     and '951d47515dbbef9738cdf3e9159a0e58597f3608'


Trivial merge