merge of '3fbb4f20eaa43ac0231abc4fca35b72b8315a041'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 3 Oct 2007 14:39:43 +0000 (14:39 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 3 Oct 2007 14:39:43 +0000 (14:39 +0000)
     and '63ff287b2ffbc385772337cafb93d55ebffd3192'


Trivial merge