merge of '6d07e119d774985e157fc9a56bb59bfbe0dcec50'
authorPhilip Balister <philip@balister.org>
Tue, 2 Oct 2007 19:36:31 +0000 (19:36 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 2 Oct 2007 19:36:31 +0000 (19:36 +0000)
     and '7604e2e8a0c76d28ec378a7800c3e1a42b335da5'


Trivial merge