Pull bugzilla-9362 into release branch
authorLen Brown <len.brown@intel.com>
Fri, 14 Dec 2007 20:14:52 +0000 (15:14 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 14 Dec 2007 20:14:52 +0000 (15:14 -0500)

Trivial merge