Merge commit 'origin/master' into adv
authorH. Peter Anvin <hpa@zytor.com>
Thu, 10 Jan 2008 03:07:30 +0000 (19:07 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 10 Jan 2008 03:07:30 +0000 (19:07 -0800)

Trivial merge