Pull bugzilla-5534 into release branch
authorLen Brown <len.brown@intel.com>
Sat, 17 Feb 2007 03:11:21 +0000 (22:11 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 17 Feb 2007 03:11:21 +0000 (22:11 -0500)

Trivial merge