Pull bugzilla-8346 into release branch
authorLen Brown <len.brown@intel.com>
Sun, 29 Apr 2007 03:19:25 +0000 (23:19 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 29 Apr 2007 03:19:25 +0000 (23:19 -0400)

Trivial merge