Merge branch 'nasm-2.05.xx'
commit475421695db689c14d0fc1e7dfbe6e37715500a1
authorH. Peter Anvin <hpa@zytor.com>
Thu, 6 Nov 2008 17:41:23 +0000 (6 09:41 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 6 Nov 2008 17:41:23 +0000 (6 09:41 -0800)
tree232c4d116028e4634b31ced5a5c518529d2bbdac
parentda050015068b936c348309e5b37510619ae89900
parentb46a0037c5db2ee30b2e8feab27964cdcf4bb0b4
Merge branch 'nasm-2.05.xx'