merge r2130 from trunk
authorLennart Poettering <lennart@poettering.net>
Thu, 27 Mar 2008 23:38:28 +0000 (23:38 +0000)
committerLennart Poettering <lennart@poettering.net>
Thu, 27 Mar 2008 23:38:28 +0000 (23:38 +0000)
commitedd1a509d3cc6d5a14bbbde8a8044e7ef5c8347a
treea84e81220f3a5c315c0adc714174179cc1804867
parent02840a3c9248b9cbe06e7a1cd12f30596a491476
merge r2130 from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2173 fefdeb5f-60dc-0310-8127-8f9354f1896f
src/Makefile.am
src/daemon/org.pulseaudio.policy [moved from src/daemon/PulseAudio.policy with 100% similarity]