Merge branch 'power-meter' into release
authorLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:10:22 +0000 (02:10 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:10:22 +0000 (02:10 -0400)

Trivial merge