merge of 'b08d9d4a3fc9e44d960626ad250ff9fcadee0de7'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 23 May 2007 08:51:22 +0000 (08:51 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 23 May 2007 08:51:22 +0000 (08:51 +0000)
     and 'e096dd4171fd4ad6e125678751c04753ae8624e4'


Trivial merge