Merge branch 'master' into core32
authorH. Peter Anvin <hpa@zytor.com>
Sun, 5 Jul 2009 08:05:48 +0000 (01:05 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 5 Jul 2009 08:05:48 +0000 (01:05 -0700)

Trivial merge