Pull bugzilla-5000 into release branch
authorLen Brown <len.brown@intel.com>
Fri, 16 Jun 2006 01:36:11 +0000 (21:36 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 16 Jun 2006 01:36:11 +0000 (21:36 -0400)

Trivial merge