merge r2146 from trunk
authorLennart Poettering <lennart@poettering.net>
Thu, 27 Mar 2008 23:41:34 +0000 (23:41 +0000)
committerLennart Poettering <lennart@poettering.net>
Thu, 27 Mar 2008 23:41:34 +0000 (23:41 +0000)
commite21a69eb0bb3d0fbf301e35eee75a32c20114477
treea51f1b38043fb8f35dde9909e3552f8f1eeaeeef
parent2b593d2fca2e7fb5ee84109cad45c54e3808f95e
merge r2146 from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2178 fefdeb5f-60dc-0310-8127-8f9354f1896f
src/modules/bt-proximity-helper.c