merge of '0f6db70a3ff4e230c5e3e710682fa171814afbd2'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 10:38:36 +0000 (10:38 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 10:38:36 +0000 (10:38 +0000)
     and '5c1eabefc385a2b45280ccb72d1ae5417a56f998'


Trivial merge