Merge branch 'nasm-2.05.xx'
authorH. Peter Anvin <hpa@zytor.com>
Thu, 30 Oct 2008 03:47:58 +0000 (20:47 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 30 Oct 2008 03:47:58 +0000 (20:47 -0700)

Trivial merge