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

Trivial merge