merge of '25a1b52e92703197872289b2993d3a00ab8ef3a3'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 10 Jul 2007 14:30:46 +0000 (14:30 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 10 Jul 2007 14:30:46 +0000 (14:30 +0000)
     and 'e83627c34a3570756ff549f9e7273f5bea3e57bf'


Trivial merge