tree 3f0bcfc8465f043eb9c9ff02773203284c759fbe
parent 7ee0aa7316ab244ac04e694445e8ce638cdb18d0
parent 2d36cf72ae9da8b3f205308b79e982dc74fbfcb3
author Peter Johnson <peter@tortall.net> 1208227998 -0000
committer Peter Johnson <peter@tortall.net> 1208227998 -0000

Merge [2063] and [2064] from trunk.

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