Merge commit 'origin/master' into nolen
authorH. Peter Anvin <hpa@zytor.com>
Mon, 3 Mar 2008 23:53:51 +0000 (15:53 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 3 Mar 2008 23:53:51 +0000 (15:53 -0800)

Trivial merge