Merge branch 'maint'

author Andre Noll <maan@systemlinux.org>

Sat, 24 Oct 2009 19:24:33 +0000 (21:24 +0200)

committer Andre Noll <maan@systemlinux.org>

Sat, 24 Oct 2009 19:24:33 +0000 (21:24 +0200)
author Andre Noll <maan@systemlinux.org>
Sat, 24 Oct 2009 19:24:33 +0000 (21:24 +0200)
committer Andre Noll <maan@systemlinux.org>
Sat, 24 Oct 2009 19:24:33 +0000 (21:24 +0200)
diff --cc udp_send.c
Simple merge
diff --cc vss.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Sat, 24 Oct 2009 19:24:33 +0000 (21:24 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Sat, 24 Oct 2009 19:24:33 +0000 (21:24 +0200)
		1	2
udp_send.c	patch \|	diff1 \|	diff2 \|	blob \| history
vss.c	patch \|	diff1 \|	diff2 \|	blob \| history