Merge commit 'origin/sse5'
authorH. Peter Anvin <hpa@zytor.com>
Wed, 19 Sep 2007 23:22:03 +0000 (16:22 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 19 Sep 2007 23:22:03 +0000 (16:22 -0700)

Trivial merge