Pull trivial1 into release branch
authorLen Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:37:09 +0000 (15:37 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:37:09 +0000 (15:37 -0400)

Trivial merge