merge of '36a3e8d1c238807062d51987c38ef05ebad7767c'
authorPhilip Balister <philip@balister.org>
Tue, 15 May 2007 16:59:47 +0000 (16:59 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 15 May 2007 16:59:47 +0000 (16:59 +0000)
     and '56ba744369ba7e91f99f26ec49b2be38baff69d9'


Trivial merge