Merge branch 'nasm-2.05.xx'
commit15c6be8d7569b25b1b57d6f782d669991348926f
authorH. Peter Anvin <hpa@zytor.com>
Sun, 26 Oct 2008 16:00:45 +0000 (26 09:00 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 26 Oct 2008 16:00:45 +0000 (26 09:00 -0700)
tree83c3ba4998705b065a8aad32fc2d94b180b0fec4
parentb0e0718267c13f49971b23d56eae65863de58d40
parent9a65f71d64d037092025c1e6ef051b1167a725a9
Merge branch 'nasm-2.05.xx'