merge of 'c43653bfb560ae719097dc966db74985b9b905ba'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 12 Jul 2007 09:47:22 +0000 (09:47 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 12 Jul 2007 09:47:22 +0000 (09:47 +0000)
     and 'f8480b9fe4209b03c291b9506684fe033956afa6'


Trivial merge