Auto-update from upstream
authorLen Brown <len.brown@intel.com>
Sat, 7 Jan 2006 07:05:40 +0000 (02:05 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 7 Jan 2006 07:05:40 +0000 (02:05 -0500)

Trivial merge