Merge branch 'master' of git+ssh://repo.or.cz/srv/git/nasm
authorH. Peter Anvin <hpa@zytor.com>
Mon, 19 Jan 2009 06:55:33 +0000 (22:55 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 19 Jan 2009 06:55:33 +0000 (22:55 -0800)

Trivial merge