Merge branch 'master' into new-preproc

author H. Peter Anvin <hpa@zytor.com>

Tue, 14 Jul 2009 01:41:33 +0000 (21:41 -0400)

committer H. Peter Anvin <hpa@zytor.com>

Tue, 14 Jul 2009 01:41:33 +0000 (21:41 -0400)
author H. Peter Anvin <hpa@zytor.com>
Tue, 14 Jul 2009 01:41:33 +0000 (21:41 -0400)
committer H. Peter Anvin <hpa@zytor.com>
Tue, 14 Jul 2009 01:41:33 +0000 (21:41 -0400)
diff --cc .gitignore
Simple merge
diff --cc output/outelf32.c
Simple merge
diff --cc output/outelf64.c
Simple merge
author	H. Peter Anvin <hpa@zytor.com>
	Tue, 14 Jul 2009 01:41:33 +0000 (21:41 -0400)
committer	H. Peter Anvin <hpa@zytor.com>
	Tue, 14 Jul 2009 01:41:33 +0000 (21:41 -0400)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
output/outelf32.c	patch \|	diff1 \|	diff2 \|	blob \| history
output/outelf64.c	patch \|	diff1 \|	diff2 \|	blob \| history