tree ef38339927e23c5a18f4d0ddb4b42b6cc2fea04f
parent 08829eb4e4a71e5e7c011015fe4379fea4daf6fa
author Peter Johnson <peter@tortall.net> 1270707183 -0000
committer Peter Johnson <peter@tortall.net> 1270707183 -0000

Merge [2317] from trunk.

svn path=/branches/yasm-1.0/; revision=2318