merge of 'c45039b9d53ed9e37550259ce83254ec7ac435ed'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 26 Oct 2007 21:44:25 +0000 (21:44 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 26 Oct 2007 21:44:25 +0000 (21:44 +0000)
commit871541a4df72568e56315fabeb2ec570a2db7a84
treee11d361f06b544c4c592bd59e01ffda121a1475a
parentaea7ee7f47d008330465a587850a72981f20ffe3
parent5af285d49668c33e74a48a0dfe5b4774b2840af6
Merge ... 'c45039b9d53ed9e37550259ce83254ec7ac435ed'
     and 'c5975a0ccc287717a69db83c13d7d27a459c25cb'