Merge [1796] from trunk.

svn path=/branches/yasm-0.6.x/; revision=1797
2 files changed