merge of '20b213bec4f076e1fb00a34a7a51a2905159ffc0'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 20 Mar 2008 13:11:58 +0000 (13:11 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 20 Mar 2008 13:11:58 +0000 (13:11 +0000)
     and 'ad97e9f544970d2dff4dfc87eeef79ab2ecac87a'


Trivial merge