merge of '1eb402d65c65c017f7fabfc389de63084c25dfc6'
authorPhilip Balister <philip@balister.org>
Sun, 26 Aug 2007 11:30:52 +0000 (11:30 +0000)
committerPhilip Balister <philip@balister.org>
Sun, 26 Aug 2007 11:30:52 +0000 (11:30 +0000)
     and 'ae2a216bbda2ece2aa59f605c5345f7c13121c4e'


Trivial merge