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

Trivial merge