Merge branch 'master' into new-preproc
commit340ee009d63596b1352d2f648e9b1d342f447861
authorH. Peter Anvin <hpa@zytor.com>
Tue, 14 Jul 2009 01:41:33 +0000 (13 21:41 -0400)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 14 Jul 2009 01:41:33 +0000 (13 21:41 -0400)
treead81e0d13de58eedab60ad6ff6d790ec215d4efe
parentad01495da81e1892dba3a8d8de7011b00c8a8511
parent44a0d177f09b3e7c5627c3772c9b406254eaaf64
Merge branch 'master' into new-preproc

Conflicts:
.gitignore
.gitignore
output/outelf32.c
output/outelf64.c