merge of '3cbbfcc1e2fab12fbc6b032fc4ea76618c77c318'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 1 Aug 2006 14:05:57 +0000 (14:05 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 1 Aug 2006 14:05:57 +0000 (14:05 +0000)
     and 'ee7b821b10b13b9938b5844392093bd7e294c01a'


Trivial merge