Merge branch 'master' of git://git.debian.org/git/pkg-pulseaudio/pulseaudio-upstream
authorLennart Poettering <lennart@poettering.net>
Tue, 24 Jun 2008 00:16:49 +0000 (02:16 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 24 Jun 2008 00:16:49 +0000 (02:16 +0200)

Trivial merge