tree 81a7f68a4eaf6408111e87b7f6df38f11aed8883
parent 1652cc51e683ca99c9980089422d3b39c60d179d
author Peter Johnson <peter@tortall.net> 1139710217 -0000
committer Peter Johnson <peter@tortall.net> 1139710217 -0000

Merge [1380] from trunk.

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