Merge branch 'tc1100-wmi' into release
authorLen Brown <len.brown@intel.com>
Thu, 24 Dec 2009 06:17:46 +0000 (01:17 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 24 Dec 2009 06:17:46 +0000 (01:17 -0500)

Trivial merge