Merge [2317] from trunk.

svn path=/branches/yasm-1.0/; revision=2318
2 files changed