Merge branch 'hp-wmi' into release

This commit is contained in:
Len Brown 2009-12-15 22:35:40 -05:00
commit abdef01dac