Automated merge with file:/home/micah/devel/wget/mainline

author Micah Cowan <micah@cowan.name>

Wed, 10 Oct 2007 03:50:49 +0000 (20:50 -0700)

committer Micah Cowan <micah@cowan.name>

Wed, 10 Oct 2007 03:50:49 +0000 (20:50 -0700)
author Micah Cowan <micah@cowan.name>
Wed, 10 Oct 2007 03:50:49 +0000 (20:50 -0700)
committer Micah Cowan <micah@cowan.name>
Wed, 10 Oct 2007 03:50:49 +0000 (20:50 -0700)
diff --cc .hgignore
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
author	Micah Cowan <micah@cowan.name>
	Wed, 10 Oct 2007 03:50:49 +0000 (20:50 -0700)
committer	Micah Cowan <micah@cowan.name>
	Wed, 10 Oct 2007 03:50:49 +0000 (20:50 -0700)
		1	2
.hgignore	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history