tree 2bf915d5a656f2d5c245ef0ba6f165146e84a2d8
parent f164a228f51c17ffc3ed69516a7dc6abdf2d2c8e
author scottmg@chromium.org <scottmg@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> 1346689659 +0000
committer scottmg@chromium.org <scottmg@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> 1346689659 +0000

Merge https://github.com/yasm/yasm/commit/9728322335cba96500861ef766b1546d096e5600

aka https://github.com/yasm/yasm/pull/64 from upstream.

TBR=thakis@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10914069

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