Merge [1383] from trunk.

svn path=/branches/yasm-0.5.x/; revision=1384
1 file changed