Merge branch 'master' into core32
authorH. Peter Anvin <hpa@zytor.com>
Tue, 26 May 2009 04:05:21 +0000 (21:05 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 26 May 2009 04:05:21 +0000 (21:05 -0700)

Trivial merge