merge of '4d957b0f42712e699ac776282979b42345af9a76'
authorPhilip Balister <philip@balister.org>
Thu, 23 Nov 2006 14:06:37 +0000 (14:06 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 23 Nov 2006 14:06:37 +0000 (14:06 +0000)
     and 'ba7ea90e82b9377a89dcab04346d4c86eee0f6df'


Trivial merge