Merge branch 'master' of git://git.0pointer.de/pulseaudio
commit0e1936fd56ad51509424f3eca06fe3a442b4dc9c
authorColin Guthrie <pulse@colin.guthr.ie>
Mon, 21 Jul 2008 15:04:06 +0000 (21 16:04 +0100)
committerColin Guthrie <pulse@colin.guthr.ie>
Mon, 21 Jul 2008 15:04:06 +0000 (21 16:04 +0100)
tree810672093de32914dc4082d7f3dc859f5caf5044
parent0786de2ba5b75c557426cf05075823d8f4e3662b
parent46a35c681f87b540c53d1af380ccfc65b041707f
Merge branch 'master' of git://git.0pointer.de/pulseaudio