tree 79d1952e2c654161126e3febb13c5eb03895254a
parent ea23c1e2b9f27169ec0cfa49d22cea30b25ca2ab
author Peter Johnson <peter@tortall.net> 1207964070 -0000
committer Peter Johnson <peter@tortall.net> 1207964070 -0000

Merge [2061] from trunk.

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