merge of '189b18e03546eef903e03f44c19411bd82b3d5a6'
authorGraeme Gregory <dp@xora.org.uk>
Sat, 22 Sep 2007 16:21:02 +0000 (16:21 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sat, 22 Sep 2007 16:21:02 +0000 (16:21 +0000)
     and '870a9f1c1fbda1d915e29fae9c1613f0ad5ce908'


Trivial merge