Merge commit 'nasm-2.05.01'
authorH. Peter Anvin <hpa@zytor.com>
Wed, 29 Oct 2008 17:53:37 +0000 (10:53 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 29 Oct 2008 17:53:37 +0000 (10:53 -0700)
commitfd366a9db42dfbbaeea31faa0bf5862c44c8c32b
tree07d3de8c1e25cfd49268c9501412697d15405ea1
parentea2c1f9b46175b426c1bce800e591f06ddcdf482
parent32f58028dab2aebfcf201f0daba4d26c0c1d1dee
Merge commit 'nasm-2.05.01'

Conflicts:
doc/changes.src
doc/changes.src