Pull fixes 1.126, 1.127, 1.128 from HEAD
authoraland <aland>
Mon, 30 Aug 2004 17:48:31 +0000 (17:48 +0000)
committeraland <aland>
Mon, 30 Aug 2004 17:48:31 +0000 (17:48 +0000)

Trivial merge