merge of 920d9525a1d34af2a428584693d93b4d47362f20
authorGraeme Gregory <dp@xora.org.uk>
Tue, 14 Nov 2006 10:01:21 +0000 (10:01 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 14 Nov 2006 10:01:21 +0000 (10:01 +0000)
     and f88effdc78b22b545579c089ec53f3048be8e7b4


Trivial merge