merge of '648476e08584946c4059307fb756f1cd7f7fa603'
authorPhilip Balister <philip@balister.org>
Wed, 30 Jul 2008 13:52:08 +0000 (13:52 +0000)
committerPhilip Balister <philip@balister.org>
Wed, 30 Jul 2008 13:52:08 +0000 (13:52 +0000)
     and 'eb28dc45b262f9456efc6bd50fbcf80645179f8f'


Trivial merge