Pull bugzilla-9683 into release branch
authorLen Brown <len.brown@intel.com>
Fri, 11 Jan 2008 17:28:38 +0000 (12:28 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 11 Jan 2008 17:28:38 +0000 (12:28 -0500)

Trivial merge