Merge commit 'fml/master' into next

author Andre Noll <maan@systemlinux.org>

Fri, 10 Jul 2009 07:46:32 +0000 (09:46 +0200)

committer Andre Noll <maan@systemlinux.org>

Fri, 10 Jul 2009 07:46:32 +0000 (09:46 +0200)
author Andre Noll <maan@systemlinux.org>
Fri, 10 Jul 2009 07:46:32 +0000 (09:46 +0200)
committer Andre Noll <maan@systemlinux.org>
Fri, 10 Jul 2009 07:46:32 +0000 (09:46 +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>
	Fri, 10 Jul 2009 07:46:32 +0000 (09:46 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Fri, 10 Jul 2009 07:46:32 +0000 (09:46 +0200)
		1	2
fade.c	patch \|	diff1 \|	diff2 \|	blob \| history
filter.c	patch \|	diff1 \|	diff2 \|	blob \| history
recv.c	patch \|	diff1 \|	diff2 \|	blob \| history