Merge [2190] from trunk.

svn path=/branches/yasm-0.8.x/; revision=2191