merge of '366f83dc734476009ff4e31f1729e97e922e72d1'
authorAdrian Davey <ade@beth2.org>
Wed, 13 Sep 2006 16:12:04 +0000 (16:12 +0000)
committerAdrian Davey <ade@beth2.org>
Wed, 13 Sep 2006 16:12:04 +0000 (16:12 +0000)
     and '894f5db8ff44cdd69177bc516f795dc19ade0dab'


Trivial merge