Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
authorLennart Poettering <lennart@poettering.net>
Mon, 6 Oct 2008 00:39:24 +0000 (02:39 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 6 Oct 2008 00:39:24 +0000 (02:39 +0200)

Trivial merge