tree 85fadd20ace8e9e1067f4f582ed7d211b328a622
parent 7a86dad4f92f20bf5d9542b2420a870c034d698e
author thakis@chromium.org <thakis@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> 1331445141 +0000
committer thakis@chromium.org <thakis@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> 1331445141 +0000

Merge https://github.com/yasm/yasm/commit/01ab853e68ef8aeded716d6f5b34895200f66a51
Review URL: https://chromiumcodereview.appspot.com/9666037

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@126065 4ff67af0-8c30-449e-8e8b-ad334ec8d88c