Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
authorLennart Poettering <lennart@poettering.net>
Thu, 28 May 2009 00:50:11 +0000 (02:50 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 28 May 2009 00:50:11 +0000 (02:50 +0200)

Trivial merge