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

Trivial merge