Merge branch 'maint'

author Andre Noll <maan@systemlinux.org>

Sat, 19 Dec 2009 15:50:39 +0000 (16:50 +0100)

committer Andre Noll <maan@systemlinux.org>

Sat, 19 Dec 2009 15:50:39 +0000 (16:50 +0100)
author Andre Noll <maan@systemlinux.org>
Sat, 19 Dec 2009 15:50:39 +0000 (16:50 +0100)
committer Andre Noll <maan@systemlinux.org>
Sat, 19 Dec 2009 15:50:39 +0000 (16:50 +0100)
diff --cc audiod.c
Simple merge
diff --cc fecdec_filter.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Sat, 19 Dec 2009 15:50:39 +0000 (16:50 +0100)
committer	Andre Noll <maan@systemlinux.org>
	Sat, 19 Dec 2009 15:50:39 +0000 (16:50 +0100)
		1	2
audiod.c	patch \|	diff1 \|	diff2 \|	blob \| history
fecdec_filter.c	patch \|	diff1 \|	diff2 \|	blob \| history