merge of '5f8c61f539e6f103dcfa53a341944eb1b46c96fe'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 16 Jun 2008 11:18:00 +0000 (11:18 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 16 Jun 2008 11:18:00 +0000 (11:18 +0000)
     and '5fc614e5aaeec54eb6667a7a09ba920551217a7f'


Trivial merge