merge of '603c8ef5e6749172e5aa6e43bec74c93211b8682'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 6 Dec 2007 12:20:20 +0000 (12:20 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 6 Dec 2007 12:20:20 +0000 (12:20 +0000)
     and 'a0498b1070ee87d8aa57c6ebb87c6bb5b8b8a2f8'


Trivial merge