Merge branch 'nasm-2.05.xx'
authorH. Peter Anvin <hpa@zytor.com>
Sun, 26 Oct 2008 16:00:45 +0000 (09:00 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 26 Oct 2008 16:00:45 +0000 (09:00 -0700)

Trivial merge