Automated merge.

author Xavier Saint <wget@sxav.eu>

Thu, 14 Aug 2008 16:45:26 +0000 (18:45 +0200)

committer Xavier Saint <wget@sxav.eu>

Thu, 14 Aug 2008 16:45:26 +0000 (18:45 +0200)
author Xavier Saint <wget@sxav.eu>
Thu, 14 Aug 2008 16:45:26 +0000 (18:45 +0200)
committer Xavier Saint <wget@sxav.eu>
Thu, 14 Aug 2008 16:45:26 +0000 (18:45 +0200)
diff --cc src/ChangeLog
Simple merge
diff --cc src/main.c
Simple merge
author	Xavier Saint <wget@sxav.eu>
	Thu, 14 Aug 2008 16:45:26 +0000 (18:45 +0200)
committer	Xavier Saint <wget@sxav.eu>
	Thu, 14 Aug 2008 16:45:26 +0000 (18:45 +0200)
		1	2
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.c	patch \|	diff1 \|	diff2 \|	blob \| history