merge of '4363d4f2067c14e0433c8a93cf6595a62ffd8ea1'
authorPhilip Balister <philip@balister.org>
Thu, 26 Apr 2007 19:04:03 +0000 (19:04 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 26 Apr 2007 19:04:03 +0000 (19:04 +0000)
     and '7859b1045fa3fae233d76f0be3b26d0d1ad35d8b'


Trivial merge