Merge branch 'master' of git://0pointer.de/pulseaudio
authorDaniel Mack <daniel@caiaq.de>
Tue, 1 Dec 2009 01:22:39 +0000 (02:22 +0100)
committerDaniel Mack <daniel@caiaq.de>
Tue, 1 Dec 2009 01:22:39 +0000 (02:22 +0100)

Trivial merge