Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
authorLennart Poettering <lennart@poettering.net>
Fri, 3 Apr 2009 15:50:37 +0000 (17:50 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 3 Apr 2009 15:50:37 +0000 (17:50 +0200)

Trivial merge