merge of '9f4762fefb2d3e6f2dc2cbd105e2eed072efb9cb'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 13:21:39 +0000 (13:21 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 13:21:39 +0000 (13:21 +0000)
     and 'fb5125d70e364a6aa1db0ab80f84a840cc8e6be8'


Trivial merge