merge of '841a5712bf3e160a32fddc18de65062237b46ed6'
authorPhilip Balister <philip@balister.org>
Wed, 3 Oct 2007 23:37:55 +0000 (23:37 +0000)
committerPhilip Balister <philip@balister.org>
Wed, 3 Oct 2007 23:37:55 +0000 (23:37 +0000)
     and 'f73119cc933563eddde899dd80930c0dfb4625e3'


Trivial merge