Merge branch 'misc' into release
authorLen Brown <len.brown@intel.com>
Tue, 26 Oct 2010 18:51:00 +0000 (14:51 -0400)
committerLen Brown <len.brown@intel.com>
Tue, 26 Oct 2010 18:51:00 +0000 (14:51 -0400)

Trivial merge