Auto-update from upstream
authorLen Brown <len.brown@intel.com>
Fri, 23 Dec 2005 03:01:55 +0000 (22:01 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 23 Dec 2005 03:01:55 +0000 (22:01 -0500)

Trivial merge