Merge branches 'release', 'APERF', 'ARAT', 'misc', 'kelvin', 'device-lock' and 'bjorn...
authorLen Brown <len.brown@intel.com>
Tue, 7 Apr 2009 22:18:42 +0000 (18:18 -0400)
committerLen Brown <len.brown@intel.com>
Tue, 7 Apr 2009 22:18:42 +0000 (18:18 -0400)

Trivial merge