From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Tue, 13 Jul 2010 17:16:05 +0000 (+0400)
Subject: Merge branches 'master' and 'preproc-paste-fix'
X-Git-Tag: nasm-2.11.05~591
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fed61a547f9c370223a6502200ff2c95373aa312;p=platform%2Fupstream%2Fnasm.git

Merge branches 'master' and 'preproc-paste-fix'
---

fed61a547f9c370223a6502200ff2c95373aa312