merge of '1e1adf51dc9360eaaa91db46f1ad5ca664d7a0cc'
authorPhilip Balister <philip@balister.org>
Tue, 2 Oct 2007 17:04:47 +0000 (17:04 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 2 Oct 2007 17:04:47 +0000 (17:04 +0000)
     and 'a0d6cd0bb1fc7d9eba19c1ed2eb1b84f6eb001c9'


Trivial merge