merge of 'd0e2c30b999cbef32c26717651606b8411ad02d6'
authorErik Hovland <erik@hovland.org>
Wed, 30 Aug 2006 18:42:42 +0000 (18:42 +0000)
committerErik Hovland <erik@hovland.org>
Wed, 30 Aug 2006 18:42:42 +0000 (18:42 +0000)
     and 'ffac2606c1f6116f54c1871ff55c69f027252547'


Trivial merge