Pull bugzilla-9798 into release branch
authorLen Brown <len.brown@intel.com>
Thu, 24 Jan 2008 04:48:46 +0000 (23:48 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 24 Jan 2008 04:48:46 +0000 (23:48 -0500)

Trivial merge