merge of '32c42c21fa615c7adc822a7cec5695a1227395a0'
authorPhilip Balister <philip@balister.org>
Thu, 24 Apr 2008 22:09:35 +0000 (22:09 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 24 Apr 2008 22:09:35 +0000 (22:09 +0000)
     and '63cd812e090dff06f4ed8dc754493c2b1862c8a0'


Trivial merge