Pull bugzilla-9153 into release branch
authorLen Brown <len.brown@intel.com>
Tue, 20 Nov 2007 06:17:54 +0000 (01:17 -0500)
committerLen Brown <len.brown@intel.com>
Tue, 20 Nov 2007 06:17:54 +0000 (01:17 -0500)

Trivial merge