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

Trivial merge