Merge branch 'bjorn-HID' into release
authorLen Brown <len.brown@intel.com>
Sat, 26 Sep 2009 05:08:43 +0000 (01:08 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 26 Sep 2009 05:08:43 +0000 (01:08 -0400)

Trivial merge