merge of '361f5e7496f085af56d5712f1b0cfa108c430f27'
authorGraeme Gregory <dp@xora.org.uk>
Sun, 10 Dec 2006 23:25:59 +0000 (23:25 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sun, 10 Dec 2006 23:25:59 +0000 (23:25 +0000)
     and 'bb035df7efb73705f61ef917e0a6160eb1f2dfdb'


Trivial merge