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

Trivial merge