Merge branch 'master' of git://0pointer.de/pulseaudio
authorTanu Kaskinen <tanuk@iki.fi>
Tue, 13 Oct 2009 15:42:47 +0000 (18:42 +0300)
committerTanu Kaskinen <tanuk@iki.fi>
Tue, 13 Oct 2009 15:42:47 +0000 (18:42 +0300)

Trivial merge