Auto-update from upstream
authorLen Brown <len.brown@intel.com>
Thu, 15 Dec 2005 18:15:27 +0000 (13:15 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 15 Dec 2005 18:15:27 +0000 (13:15 -0500)

Trivial merge