merge of '42ff173cbe3d22d33fbc21116ae54424b99451c8'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 3 Jan 2008 13:51:35 +0000 (13:51 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 3 Jan 2008 13:51:35 +0000 (13:51 +0000)
     and '75652b38a37c44ad34823f4fc6e67b212f2d6ec2'


Trivial merge