merge of '10c21bb238539618dce6821f24ff93b05a7abd6b'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 10 Aug 2006 13:42:36 +0000 (13:42 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 10 Aug 2006 13:42:36 +0000 (13:42 +0000)
     and 'e159af24ff18ed3b55b092ed9b90e7e60221c899'


Trivial merge