Auto-update from upstream
authorTony Luck <tony.luck@intel.com>
Mon, 5 Dec 2005 19:50:17 +0000 (11:50 -0800)
committerTony Luck <tony.luck@intel.com>
Mon, 5 Dec 2005 19:50:17 +0000 (11:50 -0800)

Trivial merge