Merge commit 'athcx/master'

author Andre Noll <maan@systemlinux.org>

Sun, 18 Jan 2009 23:29:44 +0000 (00:29 +0100)

committer Andre Noll <maan@systemlinux.org>

Sun, 18 Jan 2009 23:29:44 +0000 (00:29 +0100)
author Andre Noll <maan@systemlinux.org>
Sun, 18 Jan 2009 23:29:44 +0000 (00:29 +0100)
committer Andre Noll <maan@systemlinux.org>
Sun, 18 Jan 2009 23:29:44 +0000 (00:29 +0100)
diff --cc server.c
Simple merge
diff --cc wav_filter.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Sun, 18 Jan 2009 23:29:44 +0000 (00:29 +0100)
committer	Andre Noll <maan@systemlinux.org>
	Sun, 18 Jan 2009 23:29:44 +0000 (00:29 +0100)
		1	2
server.c	patch \|	diff1 \|	diff2 \|	blob \| history
wav_filter.c	patch \|	diff1 \|	diff2 \|	blob \| history