merge of '036e2e71bb09d2efdeab9165b6946b947e4316b2'
authorPhilip Balister <philip@balister.org>
Wed, 8 Aug 2007 23:08:40 +0000 (23:08 +0000)
committerPhilip Balister <philip@balister.org>
Wed, 8 Aug 2007 23:08:40 +0000 (23:08 +0000)
     and '73523d2b53ed38a63f46fcb966b7de6091c0c9d5'


Trivial merge