merge of 'c45039b9d53ed9e37550259ce83254ec7ac435ed'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 26 Oct 2007 21:44:25 +0000 (21:44 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 26 Oct 2007 21:44:25 +0000 (21:44 +0000)
     and 'c5975a0ccc287717a69db83c13d7d27a459c25cb'


Trivial merge