merge of '9719a8ead20aff09d9b8f2d80aff72670abba7c1'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 23 Oct 2007 11:50:53 +0000 (11:50 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 23 Oct 2007 11:50:53 +0000 (11:50 +0000)
     and 'a15433a82ceaa76923d681389ae649e7489220a8'


Trivial merge