Merge branch 'misc' into release
authorLen Brown <len.brown@intel.com>
Wed, 23 Mar 2011 06:19:58 +0000 (02:19 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 23 Mar 2011 06:19:58 +0000 (02:19 -0400)

Trivial merge