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

Trivial merge