merge r2081 from trunk
authorLennart Poettering <lennart@poettering.net>
Thu, 27 Mar 2008 21:24:48 +0000 (21:24 +0000)
committerLennart Poettering <lennart@poettering.net>
Thu, 27 Mar 2008 21:24:48 +0000 (21:24 +0000)
commitcefa0eb9d9d32a90678253d7a22887ef65a2c535
treec156428706dcf5622b290add2de16a2b297e251e
parent0e23606cf9bf8141f24fed9158dd36e6ba8e20ac
merge r2081 from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2144 fefdeb5f-60dc-0310-8127-8f9354f1896f
src/pulse/context.c