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

Merge branch 'master' into next

Conflicts:
	audiod_command.c
---

ec354cf583bc2838ecfac64c428d3f992681c5fc