Pull pending-2.6.14 into release branch
Tony Luck [Mon, 29 Aug 2005 22:48:23 +0000 (15:48 -0700)]

Trivial merge