merge of '8fb06f47da36b8b2158bea8339a80be10a144e3c'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 5 Mar 2008 16:52:01 +0000 (16:52 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 5 Mar 2008 16:52:01 +0000 (16:52 +0000)
     and 'a064a0293b3a138710553a3fa279c7f690061da8'


Trivial merge