merge of '920beec0b59e56ef7bdeb9dbfb0f43e8e2e31cda'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 17 Oct 2007 12:44:11 +0000 (12:44 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 17 Oct 2007 12:44:11 +0000 (12:44 +0000)
     and 'b33bb5b61a71ff15a289c03f037aab9649d5e29c'


Trivial merge