Merge branch 'master' into next

author Andre Noll <maan@systemlinux.org>

Thu, 9 Jul 2009 14:14:28 +0000 (16:14 +0200)

committer Andre Noll <maan@systemlinux.org>

Thu, 9 Jul 2009 14:14:28 +0000 (16:14 +0200)
author Andre Noll <maan@systemlinux.org>
Thu, 9 Jul 2009 14:14:28 +0000 (16:14 +0200)
committer Andre Noll <maan@systemlinux.org>
Thu, 9 Jul 2009 14:14:28 +0000 (16:14 +0200)
diff --cc fade.c
Simple merge
diff --cc filter.c
Simple merge
diff --cc recv.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Thu, 9 Jul 2009 14:14:28 +0000 (16:14 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Thu, 9 Jul 2009 14:14:28 +0000 (16:14 +0200)
		1	2
fade.c	patch \|	diff1 \|	diff2 \|	blob \| history
filter.c	patch \|	diff1 \|	diff2 \|	blob \| history
recv.c	patch \|	diff1 \|	diff2 \|	blob \| history