merge of 'c131d7e3d40b16059d9414cab4af635e5681c790'
authorErik Hovland <erik@hovland.org>
Thu, 31 Aug 2006 17:33:31 +0000 (17:33 +0000)
committerErik Hovland <erik@hovland.org>
Thu, 31 Aug 2006 17:33:31 +0000 (17:33 +0000)
     and 'e16e6a228ba05836f11e6096da8531c66005dd42'


Trivial merge