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

Trivial merge