Pull now into release branch
authorLen Brown <len.brown@intel.com>
Sat, 23 Jun 2007 14:58:24 +0000 (10:58 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 23 Jun 2007 14:58:24 +0000 (10:58 -0400)

Trivial merge