From: Andre Noll <maan@systemlinux.org>
Date: Sat, 18 Jul 2009 13:24:48 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~50^2~12
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=fb62100d23baea388cec78e572b0f36d051a61c0;hp=-c

Merge branch 'master' into next

Conflicts:
	audiod_command.c
---

fb62100d23baea388cec78e572b0f36d051a61c0