tree a79dc281bf4ca05630c46c1f219aaffbc004cd69
parent 9146c8996bc58b682da0208cf5c8a39622c62381
parent ff21f3e607c91163253b74a63e5bac433a57a0ab
author Peter Johnson <peter@tortall.net> 1237952525 -0000
committer Peter Johnson <peter@tortall.net> 1237952525 -0000

Merge [2190] from trunk.

svn path=/branches/yasm-0.8.x/; revision=2191