Merge branch 'for-3.81'
authorH. Peter Anvin <hpa@zytor.com>
Fri, 29 May 2009 06:42:49 +0000 (23:42 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 29 May 2009 06:42:49 +0000 (23:42 -0700)

Trivial merge