Pull bugzilla-6859 into release branch
authorLen Brown <len.brown@intel.com>
Sat, 10 Mar 2007 04:18:35 +0000 (23:18 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 10 Mar 2007 04:18:35 +0000 (23:18 -0500)

Trivial merge