Merge branch 'wmi' into release

This commit is contained in:
Len Brown 2009-12-16 02:21:25 -05:00
commit b6202832b4