merge of '7299860d8a9c6a13547c594ec97758782d127419'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 16 Nov 2007 22:39:32 +0000 (22:39 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 16 Nov 2007 22:39:32 +0000 (22:39 +0000)
     and 'c69cd84ca3d5ca840f9c578fe9f51ce6061a7f50'


Trivial merge