merge of '9de07e481a86e3f14756eb2ba1a6101ccb1cc6b7'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 23 Oct 2007 11:51:42 +0000 (11:51 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 23 Oct 2007 11:51:42 +0000 (11:51 +0000)
     and 'e930cc8c870552eea45fd56db9c1b737a0982b2e'


Trivial merge