Pull now into release branch
authorLen Brown <len.brown@intel.com>
Sat, 22 Sep 2007 01:55:29 +0000 (21:55 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 22 Sep 2007 01:55:29 +0000 (21:55 -0400)

Trivial merge