Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
authorLennart Poettering <lennart@poettering.net>
Thu, 31 Jul 2008 20:34:09 +0000 (23:34 +0300)
committerLennart Poettering <lennart@poettering.net>
Thu, 31 Jul 2008 20:34:09 +0000 (23:34 +0300)

Trivial merge