tree b8a0a4da54637f8e336d7be9ccfff14a7110ee40
parent d814c475524f988a75278d921a4e66a11b9f7e91
author Peter Johnson <peter@tortall.net> 1139716935 -0000
committer Peter Johnson <peter@tortall.net> 1139716935 -0000

Merge [1383] from trunk.

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