Merge branch 't/alsa_drain_fix'
authorAndre Noll <maan@systemlinux.org>
Thu, 23 Jun 2011 17:13:40 +0000 (19:13 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 23 Jun 2011 17:13:40 +0000 (19:13 +0200)

Trivial merge