merge of '7435522d56d19ccf11e4eb570b93e2f6cc418b0b'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 20 Mar 2008 07:59:46 +0000 (07:59 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 20 Mar 2008 07:59:46 +0000 (07:59 +0000)
     and 'f460277636d213d6a3257745ceaac42b26814877'


Trivial merge