tree 0c73a3c3cf11f60fa569a92b7ae9c3a89fb17832
parent d0ca56ed4aab066e183b7f38557291a10c30ff6c
author Peter Johnson <peter@tortall.net> 1172360114 -0000
committer Peter Johnson <peter@tortall.net> 1172360114 -0000

Merge [1796] from trunk.

svn path=/branches/yasm-0.6.x/; revision=1797