Merge branches 'release', 'acpi_disabled' and 'bugzilla-10958' into release
authorLen Brown <len.brown@intel.com>
Thu, 26 Jun 2008 05:56:35 +0000 (01:56 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 26 Jun 2008 05:56:35 +0000 (01:56 -0400)

Trivial merge