Merge branch 'master' of git+ssh://ccrayne@repo.or.cz/srv/git/nasm
authorCharles Crayne <chuck@thor.crayne.org>
Fri, 21 Sep 2007 04:33:43 +0000 (21:33 -0700)
committerCharles Crayne <chuck@thor.crayne.org>
Fri, 21 Sep 2007 04:33:43 +0000 (21:33 -0700)

Trivial merge