Merge [1547]-[1593] (inclusive) from trunk.

svn path=/branches/new-optimizer/; revision=1597

diff --cc frontends/yasm/yasm.c
Simple merge

diff --cc libyasm/bc-data.c
Simple merge

diff --cc libyasm/tests/Makefile.inc
Simple merge

diff --cc modules/arch/x86/x86id.c
Simple merge

diff --cc modules/parsers/nasm/nasm-bison.y
Simple merge