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

Trivial merge