Pull bugzilla-5653 into release branch
authorLen Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:41:53 +0000 (15:41 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:41:53 +0000 (15:41 -0400)

Trivial merge