merge of 'bb3a350cb54c9fb4c228cbda61641d9fce41e303'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 26 Feb 2008 16:22:45 +0000 (16:22 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 26 Feb 2008 16:22:45 +0000 (16:22 +0000)
     and 'ff93c9e7d2875781e7af90b2d3588461fb232fb4'


Trivial merge