Pull 5283 into release branch
authorLen Brown <len.brown@intel.com>
Thu, 1 Dec 2005 03:28:15 +0000 (22:28 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 1 Dec 2005 03:28:15 +0000 (22:28 -0500)

Trivial merge