merge of '31791b517fd0fdc4e50c48d20a836408a23727d3'
authorGraeme Gregory <dp@xora.org.uk>
Sun, 27 Aug 2006 17:20:35 +0000 (17:20 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sun, 27 Aug 2006 17:20:35 +0000 (17:20 +0000)
     and 'ce3b6559d2cb3ba65a6dd0f69e76c890fe48f129'


Trivial merge