Merge branch 'nasm-2.09.xx'
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 23 Jun 2011 20:41:01 +0000 (13:41 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 23 Jun 2011 20:41:01 +0000 (13:41 -0700)

Trivial merge