Merge branch 't/udp_robustness'

author Andre Noll <maan@systemlinux.org>

Mon, 12 Apr 2010 16:21:23 +0000 (18:21 +0200)

committer Andre Noll <maan@systemlinux.org>

Mon, 12 Apr 2010 16:21:23 +0000 (18:21 +0200)
author Andre Noll <maan@systemlinux.org>
Mon, 12 Apr 2010 16:21:23 +0000 (18:21 +0200)
committer Andre Noll <maan@systemlinux.org>
Mon, 12 Apr 2010 16:21:23 +0000 (18:21 +0200)
diff --cc chunk_queue.c
Simple merge
diff --cc udp_send.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Mon, 12 Apr 2010 16:21:23 +0000 (18:21 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Mon, 12 Apr 2010 16:21:23 +0000 (18:21 +0200)
		1	2
chunk_queue.c	patch \|	diff1 \|	diff2 \|	blob \| history
udp_send.c	patch \|	diff1 \|	diff2 \|	blob \| history