Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
authorLennart Poettering <lennart@poettering.net>
Mon, 23 Nov 2009 04:45:33 +0000 (05:45 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 23 Nov 2009 04:45:33 +0000 (05:45 +0100)

Trivial merge