Merge [1593] from trunk.

svn path=/branches/yasm-0.5.x/; revision=1594
4 files changed