merge of '36192872b2176688fcbc4233f22dc68b6987bd11'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 19 Nov 2007 15:46:45 +0000 (15:46 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 19 Nov 2007 15:46:45 +0000 (15:46 +0000)
commitcdcc825f5cb18922289afe3a50d5be19a47d8d04
tree011afdcff21c7a6cf96a71ae25f3e3888a67a6eb
parent71ce7ab5698d5ba25a4ba7f27cf1b32560054f4c
parent538e067ce8aae8035995ca85e611709db86c42c8
Merge ... '36192872b2176688fcbc4233f22dc68b6987bd11'
     and '3efef7b4ec3372c8afd945bbe044ae2bc011cb38'