merge of '341bfb71e3c8c826d917294e9a21a693550ae71d'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 24 Oct 2007 13:21:25 +0000 (13:21 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 24 Oct 2007 13:21:25 +0000 (13:21 +0000)
     and '9321839eb9e003743540c7353fa0c4865566f2cf'


Trivial merge