merge of '4d795eb920749e4b57552891946fac066af26b7d'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 5 Sep 2007 12:43:38 +0000 (12:43 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 5 Sep 2007 12:43:38 +0000 (12:43 +0000)
     and '7181fd7d242ef9d29a89f2d8fa4b4ab5d42801ba'


Trivial merge