merge of '751075256c107f73ba206ce1dd071de65d4d33c4'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 6 Aug 2008 10:01:54 +0000 (10:01 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 6 Aug 2008 10:01:54 +0000 (10:01 +0000)
     and '9b0c628cc38533c1bd3c58efadccbe831221b079'


Trivial merge