merge of '2acba65c8c804098ab2625930ee900a953d813a1'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 17 Oct 2006 11:45:37 +0000 (11:45 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 17 Oct 2006 11:45:37 +0000 (11:45 +0000)
     and '81c5fe61feffcba3e84830af1c27e7cdd8e482ff'


Trivial merge