Merge [1380] from trunk.

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