Auto-update from upstream
authorLen Brown <len.brown@intel.com>
Thu, 1 Dec 2005 03:22:52 +0000 (22:22 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 1 Dec 2005 03:22:52 +0000 (22:22 -0500)

Trivial merge