merge r2184 from prepare-0.9.10
authorLennart Poettering <lennart@poettering.net>
Mon, 31 Mar 2008 22:05:48 +0000 (22:05 +0000)
committerLennart Poettering <lennart@poettering.net>
Mon, 31 Mar 2008 22:05:48 +0000 (22:05 +0000)
commit78bdb978c67faa9b9f3e908b6c930438359886a3
tree12610820f1c8684e5e50bc20572ce2e48f66d00b
parente382f2233fa1cb35db77bc279c0469ac5c741d4d
merge r2184 from prepare-0.9.10

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