Merge commit 'origin/master' into nolen
authorH. Peter Anvin <hpa@zytor.com>
Mon, 24 Mar 2008 23:03:21 +0000 (16:03 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 24 Mar 2008 23:03:21 +0000 (16:03 -0700)

Trivial merge