merge of '249c76d0a12f930196eb04dbaed9848311cd283a'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 30 Aug 2007 10:34:13 +0000 (10:34 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 30 Aug 2007 10:34:13 +0000 (10:34 +0000)
commit0b15697d7674074f1a5806518ff2d9b6c61f7877
treeec6d9cbfb6cc1c45f3a02c1b826d05db4ee6a707
parent6894fb33b04ff4bed47478625f71d05d3385f766
parent50b6e431ae4b64867b98f5ca4ae38265af863de7
Merge ... '249c76d0a12f930196eb04dbaed9848311cd283a'
     and 'f7b8fecab0a891e883df73b811b50dae38261186'