Merge branch 'nasm-2.09.xx'
commit2250195a1aea0e7ffcb329563acc1dde00c14452
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 15 Mar 2011 22:41:54 +0000 (15 15:41 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 15 Mar 2011 22:41:54 +0000 (15 15:41 -0700)
tree23276e48c9a624d2fee4cc393d72954040354b82
parenta09fe1ebfb6516a00a6b8d83d12586b0625b4981
parentf2536e10a02bb8813cce5883862309d5b6b0162f
Merge branch 'nasm-2.09.xx'