Merge branch 'nasm-2.03.x'
authorH. Peter Anvin <hpa@zytor.com>
Sun, 15 Jun 2008 04:10:21 +0000 (21:10 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 15 Jun 2008 04:10:21 +0000 (21:10 -0700)

Trivial merge