Merge branch 'master' of git+ssh://ccrayne@repo.or.cz/srv/git/nasm
authorCharles Crayne <chuck@thor.crayne.org>
Thu, 5 Jun 2008 23:13:06 +0000 (16:13 -0700)
committerCharles Crayne <chuck@thor.crayne.org>
Thu, 5 Jun 2008 23:13:06 +0000 (16:13 -0700)

Trivial merge