merge of '912a4116b92071ce99e54525b89d7f94cbdb6b0e'
authorPhilip Balister <philip@balister.org>
Sat, 29 Sep 2007 20:44:56 +0000 (20:44 +0000)
committerPhilip Balister <philip@balister.org>
Sat, 29 Sep 2007 20:44:56 +0000 (20:44 +0000)
     and 'c512da70bbe567d82698163abd63d820c8a3c9fa'


Trivial merge