Pull bugzilla-6687 into test branch
authorLen Brown <len.brown@intel.com>
Mon, 10 Jul 2006 06:39:36 +0000 (02:39 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 10 Jul 2006 06:39:36 +0000 (02:39 -0400)

Trivial merge