tree 5f0fc7165e58b7abd67cfb064d3b9c4254766e2f
parent 31d6a25e02975a354132ec87f5850ac89bcec4eb
author Peter Johnson <peter@tortall.net> 1153200114 -0000
committer Peter Johnson <peter@tortall.net> 1153200114 -0000

Merge [1593] from trunk.

svn path=/branches/yasm-0.5.x/; revision=1594