tree e8eec23a79fac1faea1bff9b8158743269f24f8d
parent b2145450e50f40cb2f05e68187a4f333224f7cb7
parent 447aa4a55c228c761d8e810e1abe5214cc03402e
author Peter Johnson <peter@tortall.net> 1150347509 -0000
committer Peter Johnson <peter@tortall.net> 1150347509 -0000

Merge [1579] from trunk.

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