merge r2111 from trunk
authorLennart Poettering <lennart@poettering.net>
Thu, 27 Mar 2008 23:33:18 +0000 (23:33 +0000)
committerLennart Poettering <lennart@poettering.net>
Thu, 27 Mar 2008 23:33:18 +0000 (23:33 +0000)
commit1eb7239764ff1c2cd1d6ec7269f620a6c3f8cbc9
treef5eb0f5a579e788bb8477f251e2ec4af0d035471
parent5045d26c48197de11e15b60f1e67771c3644995d
merge r2111 from trunk

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