merge of '0f87cfac5fccad575e5de64ae2f146a2937802d9'
authorGraeme Gregory <dp@xora.org.uk>
Sun, 7 Oct 2007 16:25:28 +0000 (16:25 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sun, 7 Oct 2007 16:25:28 +0000 (16:25 +0000)
     and '73760bb5d440286650e5bb584f15871132512aaf'


Trivial merge