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

Trivial merge