From: H. Peter Anvin <hpa@zytor.com>
Date: Tue, 14 Jul 2009 01:41:33 +0000 (-0400)
Subject: Merge branch 'master' into new-preproc
X-Git-Tag: nasm-2.11.05~871^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=340ee009d63596b1352d2f648e9b1d342f447861;p=platform%2Fupstream%2Fnasm.git

Merge branch 'master' into new-preproc

Conflicts:
	.gitignore
---

340ee009d63596b1352d2f648e9b1d342f447861