Pull misc-for-upstream into release branch
authorLen Brown <len.brown@intel.com>
Thu, 10 May 2007 06:50:09 +0000 (02:50 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 10 May 2007 06:50:09 +0000 (02:50 -0400)

Trivial merge