merge of '188bf8cfee8efc3cb5e4670c99fcdb1dc6534bb2'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 13 Aug 2007 13:18:19 +0000 (13:18 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 13 Aug 2007 13:18:19 +0000 (13:18 +0000)
     and '83c27aa0850cb7750b6c99b01d999e085f33ddcc'


Trivial merge