Merge branch 'hp-wmi' into release
authorLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:39:20 +0000 (01:39 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:39:20 +0000 (01:39 -0400)

Trivial merge