merge of '3979e1b277e23e3a99c5b86306581ddc32a83d53'
authorPhilip Balister <philip@balister.org>
Mon, 3 Dec 2007 22:23:38 +0000 (22:23 +0000)
committerPhilip Balister <philip@balister.org>
Mon, 3 Dec 2007 22:23:38 +0000 (22:23 +0000)
     and '3fe444996883cc54a95f94bd89d9fba641d08c20'


Trivial merge