Merge branch 'master' into core32
authorH. Peter Anvin <hpa@zytor.com>
Fri, 29 May 2009 22:23:09 +0000 (15:23 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 29 May 2009 22:23:09 +0000 (15:23 -0700)

Trivial merge