Merge commit 'origin/master'
authorH. Peter Anvin <hpa@zytor.com>
Sat, 15 Aug 2009 00:22:01 +0000 (17:22 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sat, 15 Aug 2009 00:22:01 +0000 (17:22 -0700)

Trivial merge