merge of '3620468cc84d19eb4000fb2adf648ce594360b81'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 20 Oct 2006 09:53:04 +0000 (09:53 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 20 Oct 2006 09:53:04 +0000 (09:53 +0000)
     and 'caeaa1c1178745edaf9e570da28905beabafc0fd'


Trivial merge