merge of '81c1ca19a24db9495de03956421cdf6ea0ad4e93'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 15:38:24 +0000 (15:38 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 15:38:24 +0000 (15:38 +0000)
     and 'd63819fa685c3d0474a7e11368d9dafdbcb3404f'


Trivial merge