merge of '12863abb0b7e2930410ef9d63a38c9cebf57361b'
authorPhilip Balister <philip@balister.org>
Thu, 15 May 2008 12:44:10 +0000 (12:44 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 15 May 2008 12:44:10 +0000 (12:44 +0000)
     and 'cf37c9ac56f92be7950c19ff0574c6099086b9e6'


Trivial merge