tree 7d1430ebcdc59f72388e9e070176cac64357733d
parent 6cca8a21cc91e919805c0e683bc23b9849011a71
parent e974b3d13ea70149c9ecd8fc3f1fff11b95852fc
author Peter Johnson <peter@tortall.net> 1144378740 -0000
committer Peter Johnson <peter@tortall.net> 1144378740 -0000

Merge [1463]-[1469] from trunk, updating version as appropriate.

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