From: Andre Noll <maan@systemlinux.org>
Date: Thu, 23 Jun 2011 17:13:40 +0000 (+0200)
Subject: Merge branch 't/alsa_drain_fix'
X-Git-Tag: v0.4.8~29
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=74f1e057c1579d880becb6a32acd43641b1a8c2b;ds=sidebyside

Merge branch 't/alsa_drain_fix'
---

74f1e057c1579d880becb6a32acd43641b1a8c2b