Auto-update from upstream
authorLen Brown <len.brown@intel.com>
Sat, 27 Aug 2005 02:11:28 +0000 (22:11 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 27 Aug 2005 02:11:28 +0000 (22:11 -0400)

Trivial merge