merge of '55dbe512554ea028b2d4722048c4e9d4a958022c'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 31 Oct 2007 11:29:11 +0000 (11:29 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 31 Oct 2007 11:29:11 +0000 (11:29 +0000)
     and '6aff048ce0e2244277e9b1398c4a400bdd758e30'


Trivial merge