merge of '95a513be8426c7ab7565ce3120697b9f88ce67c0'
authorPhilip Balister <philip@balister.org>
Mon, 20 Aug 2007 19:00:03 +0000 (19:00 +0000)
committerPhilip Balister <philip@balister.org>
Mon, 20 Aug 2007 19:00:03 +0000 (19:00 +0000)
     and 'a4bed52e2d6c695d814b53319f20101071ca9bff'


Trivial merge