Merge branch 'master' of git+ssh://ccrayne@repo.or.cz/srv/git/nasm
authorCharles Crayne <chuck@thor.crayne.org>
Tue, 28 Oct 2008 05:54:38 +0000 (22:54 -0700)
committerCharles Crayne <chuck@thor.crayne.org>
Tue, 28 Oct 2008 05:54:38 +0000 (22:54 -0700)

Trivial merge