merge of '38e00c6996a524d4801df65fed37f4881b44af22'
authorGraeme Gregory <dp@xora.org.uk>
Sat, 22 Sep 2007 16:18:21 +0000 (16:18 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sat, 22 Sep 2007 16:18:21 +0000 (16:18 +0000)
     and '3b02f9b6930a29a8a5f4bc4f9bf91dc27d1380ac'


Trivial merge