merge of '9a82479a1b0af8251aa5c6ea7914cc89f3029f71'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 14 Nov 2006 09:53:43 +0000 (09:53 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 14 Nov 2006 09:53:43 +0000 (09:53 +0000)
     and 'fe0bd7228d1ed03f85cd983d04ad840cc2a6c538'


Trivial merge