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)
commit44396a262286d1a07216a7c7792d4ed7a4c89ea7
treef041f625e231879050caafb100dfffae5dffd152
parent89ae400e3f57c9d60cd4da3501bb09c1502b723c
parentde584afa5e188a2da484bb5373d449598cdb9f5e
Merge branch 'power-meter' into release