Auto-update from upstream
authorLen Brown <len.brown@intel.com>
Wed, 21 Dec 2005 09:38:01 +0000 (04:38 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 21 Dec 2005 09:38:01 +0000 (04:38 -0500)

Trivial merge