Merge branch 'master' of git+ssh://repo.or.cz/srv/git/nasm
authorH. Peter Anvin <hpa@zytor.com>
Thu, 20 Sep 2007 04:41:43 +0000 (21:41 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 20 Sep 2007 04:41:43 +0000 (21:41 -0700)

Trivial merge