merge of '2f59921c707cbaf0d9cf6efc81b2c89ef6be04bd'
authorPhilip Balister <philip@balister.org>
Sat, 18 Aug 2007 11:41:29 +0000 (11:41 +0000)
committerPhilip Balister <philip@balister.org>
Sat, 18 Aug 2007 11:41:29 +0000 (11:41 +0000)
     and 'e4773d4add8eb87abae550658daa23ce8a2065fa'


Trivial merge