Merge branch 'master' into dir
authorH. Peter Anvin <hpa@zytor.com>
Mon, 16 Feb 2009 00:35:11 +0000 (16:35 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 16 Feb 2009 00:35:11 +0000 (16:35 -0800)

Trivial merge