Merge branch 'nasm-2.05.xx'
authorH. Peter Anvin <hpa@zytor.com>
Thu, 6 Nov 2008 17:41:23 +0000 (09:41 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 6 Nov 2008 17:41:23 +0000 (09:41 -0800)

Trivial merge