Auto-update from upstream
Tony Luck [Tue, 16 Aug 2005 18:29:57 +0000 (11:29 -0700)]

Trivial merge