merge of 'c60ea02b6e2c20c4e9d69083d74bafacf95bf5f6'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 18 Sep 2007 11:06:38 +0000 (11:06 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 18 Sep 2007 11:06:38 +0000 (11:06 +0000)
     and 'dba16850053a3647d83eafb21782f950995df94e'


Trivial merge