merge of '185633f8bb0ba884443e170989d375777cc45902'
authorAdrian Davey <ade@beth2.org>
Thu, 26 Oct 2006 16:13:36 +0000 (16:13 +0000)
committerAdrian Davey <ade@beth2.org>
Thu, 26 Oct 2006 16:13:36 +0000 (16:13 +0000)
     and 'b2bf808e19242492fbacc8cb80f1ee6d64565706'


Trivial merge