Merge branches 'release', 'misc' and 'misc-2.6.25' into release
authorLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:13:13 +0000 (03:13 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:13:13 +0000 (03:13 -0500)

Trivial merge