Merge branch 'misc' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:14:15 +0000 (05:14 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:14:15 +0000 (05:14 -0500)

Trivial merge