Merge branch 'master' into core32
authorH. Peter Anvin <hpa@zytor.com>
Wed, 10 Jun 2009 05:54:51 +0000 (22:54 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 10 Jun 2009 05:54:51 +0000 (22:54 -0700)

Trivial merge