Merge commit 'origin/for-3.72'
authorH. Peter Anvin <hpa@zytor.com>
Fri, 1 Aug 2008 00:34:00 +0000 (17:34 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 1 Aug 2008 00:34:00 +0000 (17:34 -0700)

Trivial merge