merge of '0b4a373bfa5dab7626c7fd0349a1eac154d0d76a'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 31 Oct 2007 11:29:31 +0000 (11:29 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 31 Oct 2007 11:29:31 +0000 (11:29 +0000)
     and 'eca725be04182c9d2ebab13eddbe22f7e48c2b17'


Trivial merge