Merge branch 't/color_cleanups'

author Andre Noll <maan@systemlinux.org>

Sat, 29 Jan 2011 10:34:18 +0000 (11:34 +0100)

committer Andre Noll <maan@systemlinux.org>

Sat, 29 Jan 2011 10:34:18 +0000 (11:34 +0100)
author Andre Noll <maan@systemlinux.org>
Sat, 29 Jan 2011 10:34:18 +0000 (11:34 +0100)
committer Andre Noll <maan@systemlinux.org>
Sat, 29 Jan 2011 10:34:18 +0000 (11:34 +0100)
diff --cc audiod.c
Simple merge
diff --cc daemon.c
Simple merge
diff --cc server.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Sat, 29 Jan 2011 10:34:18 +0000 (11:34 +0100)
committer	Andre Noll <maan@systemlinux.org>
	Sat, 29 Jan 2011 10:34:18 +0000 (11:34 +0100)
		1	2
audiod.c	patch \|	diff1 \|	diff2 \|	blob \| history
daemon.c	patch \|	diff1 \|	diff2 \|	blob \| history
server.c	patch \|	diff1 \|	diff2 \|	blob \| history