merge of '921da5f2f44b585cfc717d57b56eca8274846fc5'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 19 Apr 2007 13:24:27 +0000 (13:24 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 19 Apr 2007 13:24:27 +0000 (13:24 +0000)
     and 'e42d193ca7a0f868e261161afe5071382329b48b'


Trivial merge