merge of '6a884c524b47bc199d7c8fb08262ba476bc25c13'
authorPhilip Balister <philip@balister.org>
Mon, 22 Jan 2007 23:25:11 +0000 (23:25 +0000)
committerPhilip Balister <philip@balister.org>
Mon, 22 Jan 2007 23:25:11 +0000 (23:25 +0000)
     and '7bd390b94b4b2318084dc7d7e08bd8b0aa9e129f'


Trivial merge