Merge branch 'master' into hdt
authorH. Peter Anvin <hpa@zytor.com>
Fri, 27 Feb 2009 04:46:48 +0000 (20:46 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 27 Feb 2009 04:46:48 +0000 (20:46 -0800)

Trivial merge