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)
commit93f4e05b6bd5a0140aaf827e9626bf42582437bf
tree573e5c657e261bfa2d46995112f566275b4b19a1
parent6f116f171f10dcecd8eafffd4cffed474d843ab5
parent6540294a6e516730508e4ebbee20f539a984b795
Merge ... '42ff173cbe3d22d33fbc21116ae54424b99451c8'
     and '75652b38a37c44ad34823f4fc6e67b212f2d6ec2'