merge of '0f7564fadffb99d20d47c3f490dfd75ce830ba2a'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 6 Aug 2008 09:42:19 +0000 (09:42 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 6 Aug 2008 09:42:19 +0000 (09:42 +0000)
     and 'f560dfa2d097d4a4b936e073f125c30f8f522a07'


Trivial merge