Pull 5452 into release branch
authorLen Brown <len.brown@intel.com>
Thu, 1 Dec 2005 06:39:55 +0000 (01:39 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 1 Dec 2005 06:39:55 +0000 (01:39 -0500)

Trivial merge