merge of '0d418eb8c24867f4b26d5be6f9684d8737b541ad'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 23 May 2007 13:32:16 +0000 (13:32 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 23 May 2007 13:32:16 +0000 (13:32 +0000)
     and '1540ceee03cc4f3eb1e8920d649a07e871f55e27'


Trivial merge