Merge with trunk.
authorPierre Ossman <ossman@cendio.se>
Mon, 9 Jan 2006 16:57:42 +0000 (16:57 +0000)
committerPierre Ossman <ossman@cendio.se>
Mon, 9 Jan 2006 16:57:42 +0000 (16:57 +0000)
commit160d886c0d8f783765d06662d87c01a3603e1c4c
tree8d100b82ec24258f71c08a84f73f06cc23a39e26
parent8258146625050d242b9bc3dc5f175985feb5e2bd
Merge with trunk.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/ossman@430 fefdeb5f-60dc-0310-8127-8f9354f1896f
polyp/polyplib-stream.c