merge of '8c692ec4078a7d2e345213289da925bfca3cac63'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 4 Dec 2007 11:24:38 +0000 (11:24 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 4 Dec 2007 11:24:38 +0000 (11:24 +0000)
     and 'bee606bba2fcf2659a8e2c29fbbc9d904f84962c'


Trivial merge