Merge [2063] and [2064] from trunk.

svn path=/branches/yasm-0.7.x/; revision=2065